diff --git a/bin/run-auth.bat b/bin/run-auth.bat index 0d0952a..7ad417d 100644 --- a/bin/run-auth.bat +++ b/bin/run-auth.bat @@ -4,11 +4,11 @@ echo [ echo. cd %~dp0 -cd ../ruoyi-auth/target +cd ../intc-auth/target set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-auth.jar +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar intc-auth.jar cd bin pause \ No newline at end of file diff --git a/bin/run-gateway.bat b/bin/run-gateway.bat index e43d60b..90c8501 100644 --- a/bin/run-gateway.bat +++ b/bin/run-gateway.bat @@ -4,11 +4,11 @@ echo [ echo. cd %~dp0 -cd ../ruoyi-gateway/target +cd ../intc-gateway/target set JAVA_OPTS=-Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar ruoyi-gateway.jar +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar intc-gateway.jar cd bin pause \ No newline at end of file diff --git a/bin/run-modules-file.bat b/bin/run-modules-file.bat index 6d89c90..1fff9fc 100644 --- a/bin/run-modules-file.bat +++ b/bin/run-modules-file.bat @@ -4,11 +4,11 @@ echo [ echo. cd %~dp0 -cd ../ruoyi-modules/ruoyi-file/target +cd ../intc-modules/intc-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 +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar intc-modules-file.jar cd bin pause \ No newline at end of file diff --git a/bin/run-modules-gen.bat b/bin/run-modules-gen.bat index 0a4c390..cb1d866 100644 --- a/bin/run-modules-gen.bat +++ b/bin/run-modules-gen.bat @@ -4,11 +4,11 @@ echo [ echo. cd %~dp0 -cd ../ruoyi-modules/ruoyi-gen/target +cd ../intc-modules/intc-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 +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar intc-modules-gen.jar cd bin pause \ No newline at end of file diff --git a/bin/run-modules-job.bat b/bin/run-modules-job.bat index 443e59d..a8d21f1 100644 --- a/bin/run-modules-job.bat +++ b/bin/run-modules-job.bat @@ -4,11 +4,11 @@ echo [ echo. cd %~dp0 -cd ../ruoyi-modules/ruoyi-job/target +cd ../intc-modules/intc-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 +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar intc-modules-job.jar cd bin pause \ No newline at end of file diff --git a/bin/run-modules-system.bat b/bin/run-modules-system.bat index 26db55e..b24a04e 100644 --- a/bin/run-modules-system.bat +++ b/bin/run-modules-system.bat @@ -4,11 +4,11 @@ echo [ echo. cd %~dp0 -cd ../ruoyi-modules/ruoyi-system/target +cd ../intc-modules/intc-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 +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar intc-modules-system.jar cd bin pause \ No newline at end of file diff --git a/bin/run-monitor.bat b/bin/run-monitor.bat index 3e8e322..de71cc7 100644 --- a/bin/run-monitor.bat +++ b/bin/run-monitor.bat @@ -4,11 +4,11 @@ echo [ echo. cd %~dp0 -cd ../ruoyi-visual/ruoyi-monitor/target +cd ../intc-visual/intc-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 +java -Dfile.encoding=utf-8 %JAVA_OPTS% -jar intc-visual-monitor.jar cd bin pause \ No newline at end of file diff --git a/docker/copy.sh b/docker/copy.sh deleted file mode 100644 index ec2915b..0000000 --- a/docker/copy.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -# 复制项目的文件到对应docker路径，便于一键生成镜像。 -usage() { - echo "Usage: sh copy.sh" - exit 1 -} - - -# copy sql -echo "begin copy sql " -cp ../sql/ry_20220814.sql ./mysql/db -cp ../sql/ry_config_20220510.sql ./mysql/db - -# copy html -echo "begin copy html " -cp -r ../ruoyi-ui/dist/** ./nginx/html/dist - - -# copy jar -echo "begin copy ruoyi-gateway " -cp ../ruoyi-gateway/target/ruoyi-gateway.jar ./ruoyi/gateway/jar - -echo "begin copy ruoyi-auth " -cp ../ruoyi-auth/target/ruoyi-auth.jar ./ruoyi/auth/jar - -echo "begin copy ruoyi-visual " -cp ../ruoyi-visual/ruoyi-monitor/target/ruoyi-visual-monitor.jar ./ruoyi/visual/monitor/jar - -echo "begin copy ruoyi-modules-system " -cp ../ruoyi-modules/ruoyi-system/target/ruoyi-modules-system.jar ./ruoyi/modules/system/jar - -echo "begin copy ruoyi-modules-file " -cp ../ruoyi-modules/ruoyi-file/target/ruoyi-modules-file.jar ./ruoyi/modules/file/jar - -echo "begin copy ruoyi-modules-job " -cp ../ruoyi-modules/ruoyi-job/target/ruoyi-modules-job.jar ./ruoyi/modules/job/jar - -echo "begin copy ruoyi-modules-gen " -cp ../ruoyi-modules/ruoyi-gen/target/ruoyi-modules-gen.jar ./ruoyi/modules/gen/jar - diff --git a/docker/deploy.sh b/docker/deploy.sh deleted file mode 100644 index 0248909..0000000 --- a/docker/deploy.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh - -# 使用说明，用来提示输入参数 -usage() { - echo "Usage: sh 执行脚本.sh [port|base|modules|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=9100/tcp --permanent - firewall-cmd --add-port=9200/tcp --permanent - firewall-cmd --add-port=9201/tcp --permanent - firewall-cmd --add-port=9202/tcp --permanent - firewall-cmd --add-port=9203/tcp --permanent - firewall-cmd --add-port=9300/tcp --permanent - service firewalld restart -} - -# 启动基础环境（必须） -base(){ - docker-compose up -d ruoyi-mysql ruoyi-redis ruoyi-nacos -} - -# 启动程序模块（必须） -modules(){ - docker-compose up -d ruoyi-nginx ruoyi-gateway ruoyi-auth ruoyi-modules-system -} - -# 关闭所有环境/模块 -stop(){ - docker-compose stop -} - -# 删除所有环境/模块 -rm(){ - docker-compose rm -} - -# 根据输入参数，选择执行对应方法，不输入则执行使用说明 -case "$1" in -"port") - port -;; -"base") - base -;; -"modules") - modules -;; -"stop") - stop -;; -"rm") - rm -;; -*) - usage -;; -esac diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml deleted file mode 100644 index 931249d..0000000 --- a/docker/docker-compose.yml +++ /dev/null @@ -1,140 +0,0 @@ -version : '3.8' -services: - ruoyi-nacos: - container_name: ruoyi-nacos - image: nacos/nacos-server - build: - context: ./nacos - environment: - - MODE=standalone - volumes: - - ./nacos/logs/:/home/nacos/logs - - ./nacos/conf/application.properties:/home/nacos/conf/application.properties - ports: - - "8848:8848" - - "9848:9848" - - "9849:9849" - depends_on: - - ruoyi-mysql - ruoyi-mysql: - container_name: ruoyi-mysql - image: mysql:5.7 - build: - context: ./mysql - ports: - - "3306:3306" - volumes: - - ./mysql/conf:/etc/mysql/conf.d - - ./mysql/logs:/logs - - ./mysql/data:/var/lib/mysql - command: [ - 'mysqld', - '--innodb-buffer-pool-size=80M', - '--character-set-server=utf8mb4', - '--collation-server=utf8mb4_unicode_ci', - '--default-time-zone=+8:00', - '--lower-case-table-names=1' - ] - environment: - MYSQL_DATABASE: 'ry-cloud' - MYSQL_ROOT_PASSWORD: password - ruoyi-redis: - container_name: ruoyi-redis - image: redis - build: - context: ./redis - ports: - - "6379:6379" - volumes: - - ./redis/conf/redis.conf:/home/ruoyi/redis/redis.conf - - ./redis/data:/data - command: redis-server /home/ruoyi/redis/redis.conf - ruoyi-nginx: - container_name: ruoyi-nginx - image: nginx - build: - context: ./nginx - ports: - - "80:80" - volumes: - - ./nginx/html/dist:/home/ruoyi/projects/ruoyi-ui - - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf - - ./nginx/logs:/var/log/nginx - - ./nginx/conf.d:/etc/nginx/conf.d - depends_on: - - ruoyi-gateway - links: - - ruoyi-gateway - ruoyi-gateway: - container_name: ruoyi-gateway - build: - context: ./ruoyi/gateway - dockerfile: dockerfile - ports: - - "8080:8080" - depends_on: - - ruoyi-redis - links: - - ruoyi-redis - ruoyi-auth: - container_name: ruoyi-auth - build: - context: ./ruoyi/auth - dockerfile: dockerfile - ports: - - "9200:9200" - depends_on: - - ruoyi-redis - links: - - ruoyi-redis - ruoyi-modules-system: - container_name: ruoyi-modules-system - build: - context: ./ruoyi/modules/system - dockerfile: dockerfile - ports: - - "9201:9201" - depends_on: - - ruoyi-redis - - ruoyi-mysql - links: - - ruoyi-redis - - ruoyi-mysql - ruoyi-modules-gen: - container_name: ruoyi-modules-gen - build: - context: ./ruoyi/modules/gen - dockerfile: dockerfile - ports: - - "9202:9202" - depends_on: - - ruoyi-mysql - links: - - ruoyi-mysql - ruoyi-modules-job: - container_name: ruoyi-modules-job - build: - context: ./ruoyi/modules/job - dockerfile: dockerfile - ports: - - "9203:9203" - depends_on: - - ruoyi-mysql - links: - - ruoyi-mysql - ruoyi-modules-file: - container_name: ruoyi-modules-file - build: - context: ./ruoyi/modules/file - dockerfile: dockerfile - ports: - - "9300:9300" - volumes: - - ./ruoyi/uploadPath:/home/ruoyi/uploadPath - ruoyi-visual-monitor: - container_name: ruoyi-visual-monitor - build: - context: ./ruoyi/visual/monitor - dockerfile: dockerfile - ports: - - "9100:9100" diff --git a/docker/invest/auth/dockerfile b/docker/invest/auth/dockerfile deleted file mode 100644 index 470c8d9..0000000 --- a/docker/invest/auth/dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi -# 设置时区 容器内是UTC时区 改为按照宿主机时区运行 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/ruoyi-auth.jar /home/ruoyi/ruoyi-auth.jar -# 启动认证服务 -ENTRYPOINT ["java","-jar","ruoyi-auth.jar"] \ No newline at end of file diff --git a/docker/invest/buildAuth.sh b/docker/invest/buildAuth.sh deleted file mode 100644 index 437c871..0000000 --- a/docker/invest/buildAuth.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -docker rm -f auth -docker rmi auth:1.0.0 - -cd /mnt/data/invest/auth -docker build -t auth:1.0.0 . -docker run -di --name auth -p 9200:9200 auth:1.0.0 diff --git a/docker/invest/buildGateway.sh b/docker/invest/buildGateway.sh deleted file mode 100644 index 3ae02d7..0000000 --- a/docker/invest/buildGateway.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -docker rm -f gateway -docker rmi gateway:1.0.0 - -cd /mnt/data/invest/gateway -docker build -t gateway:1.0.0 . -docker run -di --name gateway -p 8288:8080 gateway:1.0.0 diff --git a/docker/invest/buildH5.sh b/docker/invest/buildH5.sh deleted file mode 100644 index c434303..0000000 --- a/docker/invest/buildH5.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -docker rm -f nginxh5 -docker rmi nginxh5:1.0.0 - -cd /mnt/data/invest/nginxH5 -docker build -t nginxh5:1.0.0 . -docker run -di --name nginxh5 -p 82:80 nginxh5:1.0.0 diff --git a/docker/invest/buildInvest.sh b/docker/invest/buildInvest.sh deleted file mode 100644 index 581a19d..0000000 --- a/docker/invest/buildInvest.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -docker rm -f invest -docker rmi invest:1.0.0 - -cd /mnt/data/invest/invest -docker build -t invest:1.0.0 . -docker run -di --name invest -p 9218:9218 -v /usr/share/fonts:/usr/share/fonts invest:1.0.0 diff --git a/docker/invest/buildInvestTest.sh b/docker/invest/buildInvestTest.sh deleted file mode 100644 index acdb40a..0000000 --- a/docker/invest/buildInvestTest.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -docker rm -f investtest -docker rmi investtest:1.0.0 - -cd /mnt/data/invest/investtest -docker build -t investtest:1.0.0 . -docker run -di --name investtest -p 9219:9219 -v /usr/share/fonts:/usr/share/fonts investtest:1.0.0 diff --git a/docker/invest/buildJob.sh b/docker/invest/buildJob.sh deleted file mode 100644 index ddca40d..0000000 --- a/docker/invest/buildJob.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -docker rm -f job -docker rmi job:1.0.0 - -cd /mnt/data/invest/job -docker build -t job:1.0.0 . -docker run -di --name job -p 9203:9203 job:1.0.0 diff --git a/docker/invest/buildSystem.sh b/docker/invest/buildSystem.sh deleted file mode 100644 index 61f462f..0000000 --- a/docker/invest/buildSystem.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -docker rm -f system -docker rmi system:1.0.0 - -cd /mnt/data/invest/system -docker build -t system:1.0.0 . -docker run -di --name system -p 9201:9201 system:1.0.0 diff --git a/docker/invest/buildUi.sh b/docker/invest/buildUi.sh deleted file mode 100644 index 359c369..0000000 --- a/docker/invest/buildUi.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -docker rm -f nginx -docker rmi nginx:1.0.0 - -cd /mnt/data/invest/nginx -docker build -t nginx:1.0.0 . -docker run -di --name nginx -p 81:80 nginx:1.0.0 diff --git a/docker/invest/buildUiTest.sh b/docker/invest/buildUiTest.sh deleted file mode 100644 index cccd83e..0000000 --- a/docker/invest/buildUiTest.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -docker rm -f nginxtest -docker rmi nginxtest:1.0.0 - -cd /mnt/data/invest/nginxtest -docker build -t nginxtest:1.0.0 . -docker run -di --name nginxtest -p 88:80 nginxtest:1.0.0 diff --git a/docker/invest/gateway/dockerfile b/docker/invest/gateway/dockerfile deleted file mode 100644 index 9d676e4..0000000 --- a/docker/invest/gateway/dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi -# 设置时区 容器内是UTC时区 改为按照宿主机时区运行 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/ruoyi-gateway.jar /home/ruoyi/ruoyi-gateway.jar -# 启动网关服务 -ENTRYPOINT ["java","-jar","ruoyi-gateway.jar"] \ No newline at end of file diff --git a/docker/invest/invest/dockerfile b/docker/invest/invest/dockerfile deleted file mode 100644 index d5bef24..0000000 --- a/docker/invest/invest/dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER tianyongbao -# 设置时区 容器内是UTC时区 改为按照宿主机时区运行 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone -# 挂载目录 -VOLUME /home/intc -# 创建目录 -RUN mkdir -p /home/intc -# 指定路径 -WORKDIR /home/intc -# 复制jar文件到路径 -COPY ./jar/intc-invest.jar /home/intc/intc-invest.jar -# 启动系统服务 -ENTRYPOINT ["java","-jar","intc-invest.jar"] \ No newline at end of file diff --git a/docker/invest/investtest/dockerfile b/docker/invest/investtest/dockerfile deleted file mode 100644 index c1d14c5..0000000 --- a/docker/invest/investtest/dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER tianyongbao -# 设置时区 容器内是UTC时区 改为按照宿主机时区运行 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone -# 挂载目录 -VOLUME /home/intc -# 创建目录 -RUN mkdir -p /home/intc -# 指定路径 -WORKDIR /home/intc -# 复制jar文件到路径 -COPY ./jar/intc-invest-test.jar /home/intc/intc-invest-test.jar -# 启动系统服务 -ENTRYPOINT ["java","-jar","intc-invest-test.jar"] \ No newline at end of file diff --git a/docker/invest/job/dockerfile b/docker/invest/job/dockerfile deleted file mode 100644 index e884011..0000000 --- a/docker/invest/job/dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi -# 设置时区 容器内是UTC时区 改为按照宿主机时区运行 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/ruoyi-modules-job.jar /home/ruoyi/ruoyi-modules-job.jar -# 启动系统服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-job.jar"] \ No newline at end of file diff --git a/docker/invest/nginx/conf/nginx.conf b/docker/invest/nginx/conf/nginx.conf deleted file mode 100644 index 3680d40..0000000 --- a/docker/invest/nginx/conf/nginx.conf +++ /dev/null @@ -1,55 +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 20m; -server_tokens off; - - server { - listen 80; - server_name localhost; - add_header Referrer-Policy "no-referrer"; - - location /stub_status { - stub_status on; - access_log off; - allow 192.168.0.177; - } - - location / { - root /home/ruoyi/projects/ruoyi-ui; - try_files $uri $uri/ /index.html; - index index.html index.htm; - } - location /fileUrl/ { - rewrite ^/fileUrl/(.*) /$1 break; - proxy_pass http://203.0.105.106:9000; - } - location /prod-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_set_header X-Forwarded-Proto $scheme; - proxy_redirect off; - proxy_pass http://203.0.105.106:8288/; - } - location /bimapi/ { - rewrite ^/bimapi/(.*) /$1 break; - proxy_pass http://140.249.24.92:3101; - } - - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } - } -} diff --git a/docker/invest/nginx/dockerfile b/docker/invest/nginx/dockerfile deleted file mode 100644 index 49b0242..0000000 --- a/docker/invest/nginx/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM nginx:1.23.3 -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi/projects/ruoyi-ui -# 创建目录 -RUN mkdir -p /home/ruoyi/projects/ruoyi-ui -# 指定路径 -WORKDIR /home/ruoyi/projects/ruoyi-ui -# 复制conf文件到路径 -COPY ./conf/nginx.conf /etc/nginx/nginx.conf -# 复制html文件到路径 -COPY ./html/dist /home/ruoyi/projects/ruoyi-ui diff --git a/docker/invest/nginxH5/conf/nginx.conf b/docker/invest/nginxH5/conf/nginx.conf deleted file mode 100644 index 44a597c..0000000 --- a/docker/invest/nginxH5/conf/nginx.conf +++ /dev/null @@ -1,55 +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 20m; -server_tokens off; - - server { - listen 80; - server_name localhost; - add_header Referrer-Policy "no-referrer"; - - location /stub_status { - stub_status on; - access_log off; - allow 192.168.0.177; - } - - location / { - root /home/ruoyi/projects/ruoyi-h5; - try_files $uri $uri/ /index.html; - index index.html index.htm; - } - location /fileUrl/ { - rewrite ^/fileUrl/(.*) /$1 break; - proxy_pass http://203.0.105.106:9000; - } - location /prod-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_set_header X-Forwarded-Proto $scheme; - proxy_redirect off; - proxy_pass http://203.0.105.106:8288/; - } - location /bimapi/ { - rewrite ^/bimapi/(.*) /$1 break; - proxy_pass http://140.249.24.92:3101; - } - - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } - } -} diff --git a/docker/invest/nginxH5/dockerfile b/docker/invest/nginxH5/dockerfile deleted file mode 100644 index 64ce07f..0000000 --- a/docker/invest/nginxH5/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM nginx:1.23.3 -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi/projects/ruoyi-h5 -# 创建目录 -RUN mkdir -p /home/ruoyi/projects/ruoyi-h5 -# 指定路径 -WORKDIR /home/ruoyi/projects/ruoyi-h5 -# 复制conf文件到路径 -COPY ./conf/nginx.conf /etc/nginx/nginx.conf -# 复制html文件到路径 -COPY ./html/dist /home/ruoyi/projects/ruoyi-h5 diff --git a/docker/invest/nginxtest/conf/nginx.conf b/docker/invest/nginxtest/conf/nginx.conf deleted file mode 100644 index 3680d40..0000000 --- a/docker/invest/nginxtest/conf/nginx.conf +++ /dev/null @@ -1,55 +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 20m; -server_tokens off; - - server { - listen 80; - server_name localhost; - add_header Referrer-Policy "no-referrer"; - - location /stub_status { - stub_status on; - access_log off; - allow 192.168.0.177; - } - - location / { - root /home/ruoyi/projects/ruoyi-ui; - try_files $uri $uri/ /index.html; - index index.html index.htm; - } - location /fileUrl/ { - rewrite ^/fileUrl/(.*) /$1 break; - proxy_pass http://203.0.105.106:9000; - } - location /prod-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_set_header X-Forwarded-Proto $scheme; - proxy_redirect off; - proxy_pass http://203.0.105.106:8288/; - } - location /bimapi/ { - rewrite ^/bimapi/(.*) /$1 break; - proxy_pass http://140.249.24.92:3101; - } - - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } - } -} diff --git a/docker/invest/nginxtest/dockerfile b/docker/invest/nginxtest/dockerfile deleted file mode 100644 index 49b0242..0000000 --- a/docker/invest/nginxtest/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM nginx:1.23.3 -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi/projects/ruoyi-ui -# 创建目录 -RUN mkdir -p /home/ruoyi/projects/ruoyi-ui -# 指定路径 -WORKDIR /home/ruoyi/projects/ruoyi-ui -# 复制conf文件到路径 -COPY ./conf/nginx.conf /etc/nginx/nginx.conf -# 复制html文件到路径 -COPY ./html/dist /home/ruoyi/projects/ruoyi-ui diff --git a/docker/invest/system/dockerfile b/docker/invest/system/dockerfile deleted file mode 100644 index f400a50..0000000 --- a/docker/invest/system/dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi -# 设置时区 容器内是UTC时区 改为按照宿主机时区运行 -RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/ruoyi-modules-system.jar /home/ruoyi/ruoyi-modules-system.jar -# 启动系统服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-system.jar"] \ No newline at end of file diff --git a/docker/mysql/db/readme.txt b/docker/mysql/db/readme.txt deleted file mode 100644 index 0b22f3f..0000000 --- a/docker/mysql/db/readme.txt +++ /dev/null @@ -1 +0,0 @@ -sqlĿ¼µнűdockerԶִС \ No newline at end of file diff --git a/docker/mysql/dockerfile b/docker/mysql/dockerfile deleted file mode 100644 index cc006f4..0000000 --- a/docker/mysql/dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -# 基础镜像 -FROM mysql:5.7 -# author -MAINTAINER ruoyi - -# 执行sql脚本 -ADD ./db/*.sql /docker-entrypoint-initdb.d/ diff --git a/docker/nacos/conf/application.properties b/docker/nacos/conf/application.properties deleted file mode 100644 index 7f2a61f..0000000 --- a/docker/nacos/conf/application.properties +++ /dev/null @@ -1,32 +0,0 @@ -spring.datasource.platform=mysql -db.num=1 -db.url.0=jdbc:mysql://ruoyi-mysql:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC -db.user=root -db.password=password - -nacos.naming.empty-service.auto-clean=true -nacos.naming.empty-service.clean.initial-delay-ms=50000 -nacos.naming.empty-service.clean.period-time-ms=30000 - -management.endpoints.web.exposure.include=* - -management.metrics.export.elastic.enabled=false -management.metrics.export.influx.enabled=false - -server.tomcat.accesslog.enabled=true -server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i - -server.tomcat.basedir=/home/ruoyi/nacos/tomcat/logs - -nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/** - -nacos.core.auth.system.type=nacos -nacos.core.auth.enabled=false -nacos.core.auth.default.token.expire.seconds=18000 -nacos.core.auth.default.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789 -nacos.core.auth.caching.enabled=true -nacos.core.auth.enable.userAgentAuthWhite=false -nacos.core.auth.server.identity.key=serverIdentity -nacos.core.auth.server.identity.value=security - -nacos.istio.mcp.server.enabled=false diff --git a/docker/nacos/dockerfile b/docker/nacos/dockerfile deleted file mode 100644 index b74762c..0000000 --- a/docker/nacos/dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -# 基础镜像 -FROM nacos/nacos-server -# author -MAINTAINER ruoyi - -# 复制conf文件到路径 -COPY ./conf/application.properties /home/nacos/conf/application.properties diff --git a/docker/nacos/nacos_config_RuoYi-Cloud-Plus_4f5288b6-86b5-4ab9-83c4-0ef6c00a278a.zip b/docker/nacos/nacos_config_RuoYi-Cloud-Plus_4f5288b6-86b5-4ab9-83c4-0ef6c00a278a.zip deleted file mode 100644 index 9cda898..0000000 Binary files a/docker/nacos/nacos_config_RuoYi-Cloud-Plus_4f5288b6-86b5-4ab9-83c4-0ef6c00a278a.zip and /dev/null differ diff --git a/docker/nacos/nacos_config_RuoYi-Cloud_3f8645ae-e5b0-4f0e-a643-e60f42dfbfaf.zip b/docker/nacos/nacos_config_RuoYi-Cloud_3f8645ae-e5b0-4f0e-a643-e60f42dfbfaf.zip deleted file mode 100644 index 3b15549..0000000 Binary files a/docker/nacos/nacos_config_RuoYi-Cloud_3f8645ae-e5b0-4f0e-a643-e60f42dfbfaf.zip and /dev/null differ diff --git a/docker/nacos/nacos_config_XueYi-MultiSaas_de7ea8d9-dfcd-430b-88d2-cdbb86bff1c5.zip b/docker/nacos/nacos_config_XueYi-MultiSaas_de7ea8d9-dfcd-430b-88d2-cdbb86bff1c5.zip deleted file mode 100644 index 26bdcb2..0000000 Binary files a/docker/nacos/nacos_config_XueYi-MultiSaas_de7ea8d9-dfcd-430b-88d2-cdbb86bff1c5.zip and /dev/null differ diff --git a/docker/nacos/nacos_config_bladex_1d218214-8003-4809-88f2-0318ae494730.zip b/docker/nacos/nacos_config_bladex_1d218214-8003-4809-88f2-0318ae494730.zip deleted file mode 100644 index c877dc6..0000000 Binary files a/docker/nacos/nacos_config_bladex_1d218214-8003-4809-88f2-0318ae494730.zip and /dev/null differ diff --git a/docker/nacos/nacos_config_intc-Cloud_4c53a103-e50a-4d79-8338-bb21d7b36c97.zip b/docker/nacos/nacos_config_intc-Cloud_4c53a103-e50a-4d79-8338-bb21d7b36c97.zip deleted file mode 100644 index 7809081..0000000 Binary files a/docker/nacos/nacos_config_intc-Cloud_4c53a103-e50a-4d79-8338-bb21d7b36c97.zip and /dev/null differ diff --git a/docker/nacos/nacos_config_intc-invest_6ff354f8-471d-46ef-bd30-b81588a009cd.zip b/docker/nacos/nacos_config_intc-invest_6ff354f8-471d-46ef-bd30-b81588a009cd.zip deleted file mode 100644 index 2ef7277..0000000 Binary files a/docker/nacos/nacos_config_intc-invest_6ff354f8-471d-46ef-bd30-b81588a009cd.zip and /dev/null differ diff --git a/docker/nginx/conf/nginx.conf b/docker/nginx/conf/nginx.conf deleted file mode 100644 index 625603b..0000000 --- a/docker/nginx/conf/nginx.conf +++ /dev/null @@ -1,36 +0,0 @@ -worker_processes 1; - -events { - worker_connections 1024; -} - -http { - include mime.types; - default_type application/octet-stream; - sendfile on; - keepalive_timeout 65; - - server { - listen 80; - server_name localhost; - - location / { - root /home/ruoyi/projects/ruoyi-ui; - try_files $uri $uri/ /index.html; - index index.html index.htm; - } - - location /prod-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://ruoyi-gateway:8080/; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; - } - } -}# requirepass 123456 \ No newline at end of file diff --git a/docker/nginx/dockerfile b/docker/nginx/dockerfile deleted file mode 100644 index 53b136d..0000000 --- a/docker/nginx/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM nginx -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi/projects/ruoyi-ui -# 创建目录 -RUN mkdir -p /home/ruoyi/projects/ruoyi-ui -# 指定路径 -WORKDIR /home/ruoyi/projects/ruoyi-ui -# 复制conf文件到路径 -COPY ./conf/nginx.conf /etc/nginx/nginx.conf -# 复制html文件到路径 -COPY ./html/dist /home/ruoyi/projects/ruoyi-ui diff --git a/docker/redis/conf/redis.conf b/docker/redis/conf/redis.conf deleted file mode 100644 index d762d65..0000000 --- a/docker/redis/conf/redis.conf +++ /dev/null @@ -1 +0,0 @@ -# requirepass 123456 \ No newline at end of file diff --git a/docker/redis/dockerfile b/docker/redis/dockerfile deleted file mode 100644 index 05c2bc4..0000000 --- a/docker/redis/dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -# 基础镜像 -FROM redis -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi/redis -# 创建目录 -RUN mkdir -p /home/ruoyi/redis -# 指定路径 -WORKDIR /home/ruoyi/redis -# 复制conf文件到路径 -COPY ./conf/redis.conf /home/ruoyi/redis/redis.conf diff --git a/docker/ruoyi/auth/dockerfile b/docker/ruoyi/auth/dockerfile deleted file mode 100644 index f3c87c5..0000000 --- a/docker/ruoyi/auth/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/ruoyi-auth.jar /home/ruoyi/ruoyi-auth.jar -# 启动认证服务 -ENTRYPOINT ["java","-jar","ruoyi-auth.jar"] \ No newline at end of file diff --git a/docker/ruoyi/auth/jar/readme.txt b/docker/ruoyi/auth/jar/readme.txt deleted file mode 100644 index c35ba276..0000000 --- a/docker/ruoyi/auth/jar/readme.txt +++ /dev/null @@ -1 +0,0 @@ -֤ĴõjarļdockerӦá \ No newline at end of file diff --git a/docker/ruoyi/gateway/dockerfile b/docker/ruoyi/gateway/dockerfile deleted file mode 100644 index 0e8f612..0000000 --- a/docker/ruoyi/gateway/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/ruoyi-gateway.jar /home/ruoyi/ruoyi-gateway.jar -# 启动网关服务 -ENTRYPOINT ["java","-jar","ruoyi-gateway.jar"] \ No newline at end of file diff --git a/docker/ruoyi/gateway/jar/readme.txt b/docker/ruoyi/gateway/jar/readme.txt deleted file mode 100644 index 5dfbec7..0000000 --- a/docker/ruoyi/gateway/jar/readme.txt +++ /dev/null @@ -1 +0,0 @@ -ģõjarļdockerӦá \ No newline at end of file diff --git a/docker/ruoyi/modules/file/dockerfile b/docker/ruoyi/modules/file/dockerfile deleted file mode 100644 index 3e23c93..0000000 --- a/docker/ruoyi/modules/file/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/ruoyi-modules-file.jar /home/ruoyi/ruoyi-modules-file.jar -# 启动文件服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-file.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/file/jar/readme.txt b/docker/ruoyi/modules/file/jar/readme.txt deleted file mode 100644 index bf2b2a7..0000000 --- a/docker/ruoyi/modules/file/jar/readme.txt +++ /dev/null @@ -1 +0,0 @@ -ļõjarļdockerӦá \ No newline at end of file diff --git a/docker/ruoyi/modules/gen/dockerfile b/docker/ruoyi/modules/gen/dockerfile deleted file mode 100644 index 4da8f30..0000000 --- a/docker/ruoyi/modules/gen/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/ruoyi-modules-gen.jar /home/ruoyi/ruoyi-modules-gen.jar -# 启动代码生成服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-gen.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/gen/jar/readme.txt b/docker/ruoyi/modules/gen/jar/readme.txt deleted file mode 100644 index 2f25c0a..0000000 --- a/docker/ruoyi/modules/gen/jar/readme.txt +++ /dev/null @@ -1 +0,0 @@ -ŴɴõjarļdockerӦá \ No newline at end of file diff --git a/docker/ruoyi/modules/job/dockerfile b/docker/ruoyi/modules/job/dockerfile deleted file mode 100644 index 3c4f7c7..0000000 --- a/docker/ruoyi/modules/job/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/ruoyi-modules-job.jar /home/ruoyi/ruoyi-modules-job.jar -# 启动定时任务服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-job.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/job/jar/readme.txt b/docker/ruoyi/modules/job/jar/readme.txt deleted file mode 100644 index 58aea0b..0000000 --- a/docker/ruoyi/modules/job/jar/readme.txt +++ /dev/null @@ -1 +0,0 @@ -ŶʱõjarļdockerӦá \ No newline at end of file diff --git a/docker/ruoyi/modules/system/dockerfile b/docker/ruoyi/modules/system/dockerfile deleted file mode 100644 index fd825ec..0000000 --- a/docker/ruoyi/modules/system/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/ruoyi-modules-system.jar /home/ruoyi/ruoyi-modules-system.jar -# 启动系统服务 -ENTRYPOINT ["java","-jar","ruoyi-modules-system.jar"] \ No newline at end of file diff --git a/docker/ruoyi/modules/system/jar/readme.txt b/docker/ruoyi/modules/system/jar/readme.txt deleted file mode 100644 index cfc2a92..0000000 --- a/docker/ruoyi/modules/system/jar/readme.txt +++ /dev/null @@ -1 +0,0 @@ -ϵͳģõjarļdockerӦá \ No newline at end of file diff --git a/docker/ruoyi/visual/monitor/dockerfile b/docker/ruoyi/visual/monitor/dockerfile deleted file mode 100644 index 1f17182..0000000 --- a/docker/ruoyi/visual/monitor/dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -# 基础镜像 -FROM openjdk:8-jre -# author -MAINTAINER ruoyi - -# 挂载目录 -VOLUME /home/ruoyi -# 创建目录 -RUN mkdir -p /home/ruoyi -# 指定路径 -WORKDIR /home/ruoyi -# 复制jar文件到路径 -COPY ./jar/ruoyi-visual-monitor.jar /home/ruoyi/ruoyi-visual-monitor.jar -# 启动系统服务 -ENTRYPOINT ["java","-jar","ruoyi-visual-monitor.jar"] \ No newline at end of file diff --git a/docker/ruoyi/visual/monitor/jar/readme.txt b/docker/ruoyi/visual/monitor/jar/readme.txt deleted file mode 100644 index 62b2841..0000000 --- a/docker/ruoyi/visual/monitor/jar/readme.txt +++ /dev/null @@ -1 +0,0 @@ -żĴõjarļdockerӦá \ No newline at end of file diff --git a/ruoyi-api/ruoyi-api-invest/pom.xml b/intc-api/intc-api-invest/pom.xml similarity index 68% rename from ruoyi-api/ruoyi-api-invest/pom.xml rename to intc-api/intc-api-invest/pom.xml index a14a3e8..e6f59a0 100644 --- a/ruoyi-api/ruoyi-api-invest/pom.xml +++ b/intc-api/intc-api-invest/pom.xml @@ -3,24 +3,24 @@ 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"> - com.ruoyi - ruoyi-api + com.intc + intc-api 3.6.3 4.0.0 - ruoyi-api-invest + intc-api-invest - ruoyi-api-invest + intc-api-invest - com.ruoyi - ruoyi-common-core + com.intc + intc-common-core diff --git a/ruoyi-api/ruoyi-api-invest/src/main/java/com/ruoyi/api/invest/RemoteInvestProdService.java b/intc-api/intc-api-invest/src/main/java/com/intc/api/invest/RemoteInvestProdService.java similarity index 89% rename from ruoyi-api/ruoyi-api-invest/src/main/java/com/ruoyi/api/invest/RemoteInvestProdService.java rename to intc-api/intc-api-invest/src/main/java/com/intc/api/invest/RemoteInvestProdService.java index ff44247..4de5a1a 100644 --- a/ruoyi-api/ruoyi-api-invest/src/main/java/com/ruoyi/api/invest/RemoteInvestProdService.java +++ b/intc-api/intc-api-invest/src/main/java/com/intc/api/invest/RemoteInvestProdService.java @@ -1,7 +1,7 @@ -package com.ruoyi.api.invest; +package com.intc.api.invest; -import com.ruoyi.common.core.constant.ServiceNameConstants; -import com.ruoyi.common.core.domain.R; +import com.intc.common.core.constant.ServiceNameConstants; +import com.intc.common.core.domain.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMethod; * * @author YaphetS */ -@FeignClient(contextId = "remoteInvestProdService", value = ServiceNameConstants.INTC_INVEST_PROD, fallbackFactory = com.ruoyi.api.invest.factory.RemoteInvestProdFallbackFactory.class) +@FeignClient(contextId = "remoteInvestProdService", value = ServiceNameConstants.INTC_INVEST_PROD, fallbackFactory = com.intc.api.invest.factory.RemoteInvestProdFallbackFactory.class) public interface RemoteInvestProdService { /** diff --git a/ruoyi-api/ruoyi-api-invest/src/main/java/com/ruoyi/api/invest/RemoteInvestService.java b/intc-api/intc-api-invest/src/main/java/com/intc/api/invest/RemoteInvestService.java similarity index 89% rename from ruoyi-api/ruoyi-api-invest/src/main/java/com/ruoyi/api/invest/RemoteInvestService.java rename to intc-api/intc-api-invest/src/main/java/com/intc/api/invest/RemoteInvestService.java index ad10a8b..e521513 100644 --- a/ruoyi-api/ruoyi-api-invest/src/main/java/com/ruoyi/api/invest/RemoteInvestService.java +++ b/intc-api/intc-api-invest/src/main/java/com/intc/api/invest/RemoteInvestService.java @@ -1,6 +1,6 @@ -package com.ruoyi.api.invest; -import com.ruoyi.common.core.constant.ServiceNameConstants; -import com.ruoyi.common.core.domain.R; +package com.intc.api.invest; +import com.intc.common.core.constant.ServiceNameConstants; +import com.intc.common.core.domain.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.*; * * @author YaphetS */ -@FeignClient(contextId = "remoteInvestService", value = ServiceNameConstants.INTC_INVEST, fallbackFactory = com.ruoyi.api.invest.factory.RemoteInvestFallbackFactory.class) +@FeignClient(contextId = "remoteInvestService", value = ServiceNameConstants.INTC_INVEST, fallbackFactory = com.intc.api.invest.factory.RemoteInvestFallbackFactory.class) public interface RemoteInvestService { /** diff --git a/ruoyi-api/ruoyi-api-invest/src/main/java/com/ruoyi/api/invest/factory/RemoteInvestFallbackFactory.java b/intc-api/intc-api-invest/src/main/java/com/intc/api/invest/factory/RemoteInvestFallbackFactory.java similarity index 91% rename from ruoyi-api/ruoyi-api-invest/src/main/java/com/ruoyi/api/invest/factory/RemoteInvestFallbackFactory.java rename to intc-api/intc-api-invest/src/main/java/com/intc/api/invest/factory/RemoteInvestFallbackFactory.java index fef3184..8f49c11 100644 --- a/ruoyi-api/ruoyi-api-invest/src/main/java/com/ruoyi/api/invest/factory/RemoteInvestFallbackFactory.java +++ b/intc-api/intc-api-invest/src/main/java/com/intc/api/invest/factory/RemoteInvestFallbackFactory.java @@ -1,7 +1,7 @@ -package com.ruoyi.api.invest.factory; +package com.intc.api.invest.factory; -import com.ruoyi.api.invest.RemoteInvestService; -import com.ruoyi.common.core.domain.R; +import com.intc.api.invest.RemoteInvestService; +import com.intc.common.core.domain.R; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; @Component public class RemoteInvestFallbackFactory implements FallbackFactory { - private static final Logger log = LoggerFactory.getLogger(com.ruoyi.api.invest.factory.RemoteInvestFallbackFactory.class); + private static final Logger log = LoggerFactory.getLogger(com.intc.api.invest.factory.RemoteInvestFallbackFactory.class); @Override public RemoteInvestService create(Throwable throwable) diff --git a/ruoyi-api/ruoyi-api-invest/src/main/java/com/ruoyi/api/invest/factory/RemoteInvestProdFallbackFactory.java b/intc-api/intc-api-invest/src/main/java/com/intc/api/invest/factory/RemoteInvestProdFallbackFactory.java similarity index 94% rename from ruoyi-api/ruoyi-api-invest/src/main/java/com/ruoyi/api/invest/factory/RemoteInvestProdFallbackFactory.java rename to intc-api/intc-api-invest/src/main/java/com/intc/api/invest/factory/RemoteInvestProdFallbackFactory.java index 02151c4..e0e7dd6 100644 --- a/ruoyi-api/ruoyi-api-invest/src/main/java/com/ruoyi/api/invest/factory/RemoteInvestProdFallbackFactory.java +++ b/intc-api/intc-api-invest/src/main/java/com/intc/api/invest/factory/RemoteInvestProdFallbackFactory.java @@ -1,7 +1,7 @@ -package com.ruoyi.api.invest.factory; +package com.intc.api.invest.factory; -import com.ruoyi.api.invest.RemoteInvestProdService; -import com.ruoyi.common.core.domain.R; +import com.intc.api.invest.RemoteInvestProdService; +import com.intc.common.core.domain.R; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; diff --git a/intc-api/intc-api-invest/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-api/intc-api-invest/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..d2ba9bf --- /dev/null +++ b/intc-api/intc-api-invest/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.intc.api.invest.factory.RemoteInvestFallbackFactory +com.intc.api.invest.factory.RemoteInvestProdFallbackFactory \ No newline at end of file diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/intc-api/intc-api-system/pom.xml similarity index 68% rename from ruoyi-api/ruoyi-api-system/pom.xml rename to intc-api/intc-api-system/pom.xml index 3cf7642..f77f415 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/intc-api/intc-api-system/pom.xml @@ -3,24 +3,24 @@ 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"> - com.ruoyi - ruoyi-api + com.intc + intc-api 3.6.3 4.0.0 - ruoyi-api-system + intc-api-system - ruoyi-api-system系统接口模块 + intc-api-system系统接口模块 - com.ruoyi - ruoyi-common-core + com.intc + intc-common-core 3.6.3 diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteDictService.java b/intc-api/intc-api-system/src/main/java/com/intc/system/api/RemoteDictService.java similarity index 74% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteDictService.java rename to intc-api/intc-api-system/src/main/java/com/intc/system/api/RemoteDictService.java index 3977fc4..8f61aac 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteDictService.java +++ b/intc-api/intc-api-system/src/main/java/com/intc/system/api/RemoteDictService.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.api; +package com.intc.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.SysDictData; -import com.ruoyi.system.api.factory.RemoteDictFallbackFactory; +import com.intc.common.core.constant.SecurityConstants; +import com.intc.common.core.constant.ServiceNameConstants; +import com.intc.common.core.domain.R; +import com.intc.system.api.domain.SysDictData; +import com.intc.system.api.factory.RemoteDictFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java b/intc-api/intc-api-system/src/main/java/com/intc/system/api/RemoteFileService.java similarity index 82% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java rename to intc-api/intc-api-system/src/main/java/com/intc/system/api/RemoteFileService.java index 98f0d53..d12e95c 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java +++ b/intc-api/intc-api-system/src/main/java/com/intc/system/api/RemoteFileService.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.api; +package com.intc.system.api; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -6,10 +6,10 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.constant.ServiceNameConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.api.domain.SysFile; -import com.ruoyi.system.api.factory.RemoteFileFallbackFactory; +import com.intc.common.core.constant.ServiceNameConstants; +import com.intc.common.core.domain.R; +import com.intc.system.api.domain.SysFile; +import com.intc.system.api.factory.RemoteFileFallbackFactory; import feign.Response; /** diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java b/intc-api/intc-api-system/src/main/java/com/intc/system/api/RemoteLogService.java similarity index 75% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java rename to intc-api/intc-api-system/src/main/java/com/intc/system/api/RemoteLogService.java index 67af000..3854bd9 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java +++ b/intc-api/intc-api-system/src/main/java/com/intc/system/api/RemoteLogService.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.api; +package com.intc.system.api; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; -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.SysLogininfor; -import com.ruoyi.system.api.domain.SysOperLog; -import com.ruoyi.system.api.factory.RemoteLogFallbackFactory; +import com.intc.common.core.constant.SecurityConstants; +import com.intc.common.core.constant.ServiceNameConstants; +import com.intc.common.core.domain.R; +import com.intc.system.api.domain.SysLogininfor; +import com.intc.system.api.domain.SysOperLog; +import com.intc.system.api.factory.RemoteLogFallbackFactory; /** * 日志服务 diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java b/intc-api/intc-api-system/src/main/java/com/intc/system/api/RemoteUserService.java similarity index 78% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java rename to intc-api/intc-api-system/src/main/java/com/intc/system/api/RemoteUserService.java index f074cec..b05c004 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java +++ b/intc-api/intc-api-system/src/main/java/com/intc/system/api/RemoteUserService.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.api; +package com.intc.system.api; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -6,12 +6,12 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; -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.factory.RemoteUserFallbackFactory; -import com.ruoyi.system.api.model.LoginUser; +import com.intc.common.core.constant.SecurityConstants; +import com.intc.common.core.constant.ServiceNameConstants; +import com.intc.common.core.domain.R; +import com.intc.system.api.domain.SysUser; +import com.intc.system.api.factory.RemoteUserFallbackFactory; +import com.intc.system.api.model.LoginUser; /** * 用户服务 diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java b/intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysDept.java similarity index 97% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java rename to intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysDept.java index 91173f0..51d4dea 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java +++ b/intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysDept.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.api.domain; +package com.intc.system.api.domain; import java.util.ArrayList; import java.util.List; @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull; 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.intc.common.core.web.domain.BaseEntity; /** * 部门表 sys_dept diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java b/intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysDictData.java similarity index 94% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java rename to intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysDictData.java index e0c4a17..cf00854 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java +++ b/intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysDictData.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.api.domain; +package com.intc.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; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.annotation.Excel.ColumnType; +import com.intc.common.core.constant.UserConstants; +import com.intc.common.core.web.domain.BaseEntity; /** * 字典数据表 sys_dict_data diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java b/intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysDictType.java similarity index 92% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java rename to intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysDictType.java index c51a48d..2ae0ca4 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java +++ b/intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysDictType.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.api.domain; +package com.intc.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; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.annotation.Excel.ColumnType; +import com.intc.common.core.web.domain.BaseEntity; /** * 字典类型表 sys_dict_type diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java b/intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysFile.java similarity index 95% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java rename to intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysFile.java index c953b19..4f64ae0 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java +++ b/intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysFile.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.api.domain; +package com.intc.system.api.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java b/intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysLogininfor.java similarity index 90% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java rename to intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysLogininfor.java index cd3be58..89e0381 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java +++ b/intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysLogininfor.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.api.domain; +package com.intc.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; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.annotation.Excel.ColumnType; +import com.intc.common.core.web.domain.BaseEntity; /** * 系统访问记录表 sys_logininfor diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java b/intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysOperLog.java similarity index 96% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java rename to intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysOperLog.java index a3c350f..8e20294 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java +++ b/intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysOperLog.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.api.domain; +package com.intc.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; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.annotation.Excel.ColumnType; +import com.intc.common.core.web.domain.BaseEntity; /** * 操作日志记录表 oper_log diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java b/intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysRole.java similarity index 96% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java rename to intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysRole.java index 62df8b5..e2ef84b 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java +++ b/intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysRole.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.api.domain; +package com.intc.system.api.domain; import java.util.Set; import javax.validation.constraints.NotBlank; @@ -6,9 +6,9 @@ import javax.validation.constraints.NotNull; 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; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.annotation.Excel.ColumnType; +import com.intc.common.core.web.domain.BaseEntity; /** * 角色表 sys_role diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysUser.java similarity index 95% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java rename to intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysUser.java index cc44c30..3e0b982 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java +++ b/intc-api/intc-api-system/src/main/java/com/intc/system/api/domain/SysUser.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.api.domain; +package com.intc.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.annotation.Excels; -import com.ruoyi.common.core.web.domain.BaseEntity; -import com.ruoyi.common.core.xss.Xss; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.annotation.Excel.ColumnType; +import com.intc.common.core.annotation.Excel.Type; +import com.intc.common.core.annotation.Excels; +import com.intc.common.core.web.domain.BaseEntity; +import com.intc.common.core.xss.Xss; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteDictFallbackFactory.java b/intc-api/intc-api-system/src/main/java/com/intc/system/api/factory/RemoteDictFallbackFactory.java similarity index 73% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteDictFallbackFactory.java rename to intc-api/intc-api-system/src/main/java/com/intc/system/api/factory/RemoteDictFallbackFactory.java index 9211cd0..fa7fe51 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteDictFallbackFactory.java +++ b/intc-api/intc-api-system/src/main/java/com/intc/system/api/factory/RemoteDictFallbackFactory.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.api.factory; +package com.intc.system.api.factory; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.api.RemoteDictService; -import com.ruoyi.system.api.RemoteUserService; -import com.ruoyi.system.api.domain.SysDictData; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.api.model.LoginUser; +import com.intc.common.core.domain.R; +import com.intc.system.api.RemoteDictService; +import com.intc.system.api.RemoteUserService; +import com.intc.system.api.domain.SysDictData; +import com.intc.system.api.domain.SysUser; +import com.intc.system.api.model.LoginUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java b/intc-api/intc-api-system/src/main/java/com/intc/system/api/factory/RemoteFileFallbackFactory.java similarity index 86% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java rename to intc-api/intc-api-system/src/main/java/com/intc/system/api/factory/RemoteFileFallbackFactory.java index f879926..b236dfa 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java +++ b/intc-api/intc-api-system/src/main/java/com/intc/system/api/factory/RemoteFileFallbackFactory.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.api.factory; +package com.intc.system.api.factory; import feign.Response; import org.slf4j.Logger; @@ -6,9 +6,9 @@ import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.system.api.RemoteFileService; -import com.ruoyi.system.api.domain.SysFile; +import com.intc.common.core.domain.R; +import com.intc.system.api.RemoteFileService; +import com.intc.system.api.domain.SysFile; /** * 文件服务降级处理 diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java b/intc-api/intc-api-system/src/main/java/com/intc/system/api/factory/RemoteLogFallbackFactory.java similarity index 81% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java rename to intc-api/intc-api-system/src/main/java/com/intc/system/api/factory/RemoteLogFallbackFactory.java index 6acb505..5af0796 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java +++ b/intc-api/intc-api-system/src/main/java/com/intc/system/api/factory/RemoteLogFallbackFactory.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.api.factory; +package com.intc.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; +import com.intc.common.core.domain.R; +import com.intc.system.api.RemoteLogService; +import com.intc.system.api.domain.SysLogininfor; +import com.intc.system.api.domain.SysOperLog; /** * 日志服务降级处理 diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java b/intc-api/intc-api-system/src/main/java/com/intc/system/api/factory/RemoteUserFallbackFactory.java similarity index 83% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java rename to intc-api/intc-api-system/src/main/java/com/intc/system/api/factory/RemoteUserFallbackFactory.java index 029b024..dd22fb9 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java +++ b/intc-api/intc-api-system/src/main/java/com/intc/system/api/factory/RemoteUserFallbackFactory.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.api.factory; +package com.intc.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.RemoteUserService; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.api.model.LoginUser; +import com.intc.common.core.domain.R; +import com.intc.system.api.RemoteUserService; +import com.intc.system.api.domain.SysUser; +import com.intc.system.api.model.LoginUser; /** * 用户服务降级处理 diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java b/intc-api/intc-api-system/src/main/java/com/intc/system/api/model/LoginUser.java similarity index 96% rename from ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java rename to intc-api/intc-api-system/src/main/java/com/intc/system/api/model/LoginUser.java index ef266a0..709c880 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java +++ b/intc-api/intc-api-system/src/main/java/com/intc/system/api/model/LoginUser.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.api.model; +package com.intc.system.api.model; import java.io.Serializable; import java.util.Set; -import com.ruoyi.system.api.domain.SysUser; +import com.intc.system.api.domain.SysUser; /** * 用户信息 diff --git a/intc-api/intc-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-api/intc-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..c4ffdb1 --- /dev/null +++ b/intc-api/intc-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,4 @@ +com.intc.system.api.factory.RemoteUserFallbackFactory +com.intc.system.api.factory.RemoteLogFallbackFactory +com.intc.system.api.factory.RemoteFileFallbackFactory +com.intc.system.api.factory.RemoteDictFallbackFactory diff --git a/ruoyi-api/pom.xml b/intc-api/pom.xml similarity index 66% rename from ruoyi-api/pom.xml rename to intc-api/pom.xml index 8aa6149..3395678 100644 --- a/ruoyi-api/pom.xml +++ b/intc-api/pom.xml @@ -2,21 +2,21 @@ - com.ruoyi - ruoyi + com.intc + intc 3.6.3 4.0.0 - ruoyi-api-system - ruoyi-api-invest + intc-api-system + intc-api-invest - ruoyi-api + intc-api pom - ruoyi-api系统接口 + intc-api系统接口 diff --git a/ruoyi-auth/pom.xml b/intc-auth/pom.xml similarity index 90% rename from ruoyi-auth/pom.xml rename to intc-auth/pom.xml index bf2812f..ecf085c 100644 --- a/ruoyi-auth/pom.xml +++ b/intc-auth/pom.xml @@ -2,16 +2,16 @@ 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"> - com.ruoyi - ruoyi + com.intc + intc 3.6.3 4.0.0 - ruoyi-auth + intc-auth - ruoyi-auth认证授权中心 + intc-auth认证授权中心 @@ -55,8 +55,8 @@ - com.ruoyi - ruoyi-common-security + com.intc + intc-common-security 3.6.3 diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java b/intc-auth/src/main/java/com/intc/auth/IntcAuthApplication.java similarity index 84% rename from ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java rename to intc-auth/src/main/java/com/intc/auth/IntcAuthApplication.java index 1e3a087..a48a4a9 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java +++ b/intc-auth/src/main/java/com/intc/auth/IntcAuthApplication.java @@ -1,9 +1,9 @@ -package com.ruoyi.auth; +package com.intc.auth; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import com.ruoyi.common.security.annotation.EnableRyFeignClients; +import com.intc.common.security.annotation.EnableRyFeignClients; /** * 认证授权中心 @@ -12,11 +12,11 @@ import com.ruoyi.common.security.annotation.EnableRyFeignClients; */ @EnableRyFeignClients @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) -public class RuoYiAuthApplication +public class IntcAuthApplication { public static void main(String[] args) { - SpringApplication.run(RuoYiAuthApplication.class, args); + SpringApplication.run(IntcAuthApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 认证授权中心启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/config/ActuatorSecurityConfig.java b/intc-auth/src/main/java/com/intc/auth/config/ActuatorSecurityConfig.java similarity index 94% rename from ruoyi-auth/src/main/java/com/ruoyi/auth/config/ActuatorSecurityConfig.java rename to intc-auth/src/main/java/com/intc/auth/config/ActuatorSecurityConfig.java index d9e51bc..f79b7c0 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/config/ActuatorSecurityConfig.java +++ b/intc-auth/src/main/java/com/intc/auth/config/ActuatorSecurityConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.auth.config; +package com.intc.auth.config; -//import com.ruoyi.common.core.utils.StringUtils; +//import com.intc.common.core.utils.StringUtils; //import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.context.annotation.Bean; //import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/intc-auth/src/main/java/com/intc/auth/controller/TokenController.java similarity index 80% rename from ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java rename to intc-auth/src/main/java/com/intc/auth/controller/TokenController.java index 16c9eda..0f8e088 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java +++ b/intc-auth/src/main/java/com/intc/auth/controller/TokenController.java @@ -1,15 +1,15 @@ -package com.ruoyi.auth.controller; +package com.intc.auth.controller; -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; +import com.intc.auth.form.LoginBody; +import com.intc.auth.form.RegisterBody; +import com.intc.auth.service.SysLoginService; +import com.intc.common.core.domain.R; +import com.intc.common.core.utils.JwtUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.auth.AuthUtil; +import com.intc.common.security.service.TokenService; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.api.model.LoginUser; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java b/intc-auth/src/main/java/com/intc/auth/form/LoginBody.java similarity index 96% rename from ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java rename to intc-auth/src/main/java/com/intc/auth/form/LoginBody.java index e92ad24..918581a 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java +++ b/intc-auth/src/main/java/com/intc/auth/form/LoginBody.java @@ -1,4 +1,4 @@ -package com.ruoyi.auth.form; +package com.intc.auth.form; /** * 用户登录对象 diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java b/intc-auth/src/main/java/com/intc/auth/form/RegisterBody.java similarity index 77% rename from ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java rename to intc-auth/src/main/java/com/intc/auth/form/RegisterBody.java index 9741507..32209a0 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java +++ b/intc-auth/src/main/java/com/intc/auth/form/RegisterBody.java @@ -1,4 +1,4 @@ -package com.ruoyi.auth.form; +package com.intc.auth.form; /** * 用户注册对象 diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/intc-auth/src/main/java/com/intc/auth/service/SysLoginService.java similarity index 86% rename from ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java rename to intc-auth/src/main/java/com/intc/auth/service/SysLoginService.java index 39c175a..2965550 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java +++ b/intc-auth/src/main/java/com/intc/auth/service/SysLoginService.java @@ -1,22 +1,22 @@ -package com.ruoyi.auth.service; +package com.intc.auth.service; 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.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.intc.common.core.constant.CacheConstants; +import com.intc.common.core.constant.Constants; +import com.intc.common.core.constant.SecurityConstants; +import com.intc.common.core.constant.UserConstants; +import com.intc.common.core.domain.R; +import com.intc.common.core.enums.UserStatus; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.text.Convert; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.ip.IpUtils; +import com.intc.common.redis.service.RedisService; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.api.RemoteUserService; +import com.intc.system.api.domain.SysUser; +import com.intc.system.api.model.LoginUser; /** * 登录校验方法 diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java b/intc-auth/src/main/java/com/intc/auth/service/SysPasswordService.java similarity index 86% rename from ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java rename to intc-auth/src/main/java/com/intc/auth/service/SysPasswordService.java index eb18ea8..1cfab52 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java +++ b/intc-auth/src/main/java/com/intc/auth/service/SysPasswordService.java @@ -1,14 +1,14 @@ -package com.ruoyi.auth.service; +package com.intc.auth.service; import java.util.concurrent.TimeUnit; 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 com.intc.common.core.constant.CacheConstants; +import com.intc.common.core.constant.Constants; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.redis.service.RedisService; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.api.domain.SysUser; /** * 登录密码方法 diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java b/intc-auth/src/main/java/com/intc/auth/service/SysRecordLogService.java similarity index 77% rename from ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java rename to intc-auth/src/main/java/com/intc/auth/service/SysRecordLogService.java index 7ca0f00..79a8d05 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java +++ b/intc-auth/src/main/java/com/intc/auth/service/SysRecordLogService.java @@ -1,13 +1,13 @@ -package com.ruoyi.auth.service; +package com.intc.auth.service; 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; +import com.intc.common.core.constant.Constants; +import com.intc.common.core.constant.SecurityConstants; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.ip.IpUtils; +import com.intc.system.api.RemoteLogService; +import com.intc.system.api.domain.SysLogininfor; /** * 记录日志方法 diff --git a/ruoyi-auth/src/main/resources/banner.txt b/intc-auth/src/main/resources/banner.txt similarity index 100% rename from ruoyi-auth/src/main/resources/banner.txt rename to intc-auth/src/main/resources/banner.txt diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/intc-auth/src/main/resources/bootstrap.yml similarity index 84% rename from ruoyi-auth/src/main/resources/bootstrap.yml rename to intc-auth/src/main/resources/bootstrap.yml index 2cc35ef..3cb576b 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/intc-auth/src/main/resources/bootstrap.yml @@ -6,20 +6,20 @@ server: spring: application: # 应用名称 - name: ruoyi-auth + name: intc-auth profiles: # 环境配置 active: dev cloud: nacos: discovery: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 服务注册地址 server-addr: 101.126.95.100:8858 group: intc ip: 154.8.147.51 config: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 配置中心地址 server-addr: 101.126.95.100:8858 # 配置文件格式 diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml b/intc-auth/src/main/resources/logback.xml similarity index 96% rename from ruoyi-modules/ruoyi-job/src/main/resources/logback.xml rename to intc-auth/src/main/resources/logback.xml index f0e0f1a..f3e20da 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/logback.xml +++ b/intc-auth/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/intc-common/intc-common-core/pom.xml similarity index 96% rename from ruoyi-common/ruoyi-common-core/pom.xml rename to intc-common/intc-common-core/pom.xml index 9fed7c0..7ae2228 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/intc-common/intc-common-core/pom.xml @@ -3,16 +3,16 @@ 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"> - com.ruoyi - ruoyi-common + com.intc + intc-common 3.6.3 4.0.0 - ruoyi-common-core + intc-common-core - ruoyi-common-core核心模块 + intc-common-core核心模块 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/annotation/Excel.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/annotation/Excel.java index f77183a..8b0b13b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/annotation/Excel.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.annotation; +package com.intc.common.core.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -7,7 +7,7 @@ import java.lang.annotation.Target; import java.math.BigDecimal; import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.IndexedColors; -import com.ruoyi.common.core.utils.poi.ExcelHandlerAdapter; +import com.intc.common.core.utils.poi.ExcelHandlerAdapter; /** * 自定义导出Excel数据注解 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/annotation/Excels.java similarity index 88% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/annotation/Excels.java index 38135e7..33d206a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/annotation/Excels.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.annotation; +package com.intc.common.core.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/AlarmConstants.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/AlarmConstants.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/AlarmConstants.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/AlarmConstants.java index b608840..45722a5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/AlarmConstants.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/AlarmConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.constant; +package com.intc.common.core.constant; /** * 系统报警常量 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/CacheConstants.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/CacheConstants.java index a5522cf..39b96c1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/CacheConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.constant; +package com.intc.common.core.constant; /** * 缓存常量信息 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/Constants.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/Constants.java index 5f7b06f..091a35c 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/Constants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.constant; +package com.intc.common.core.constant; /** * 通用常量信息 @@ -120,11 +120,11 @@ public class Constants /** * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） */ - public static final String[] JOB_WHITELIST_STR = { "com.ruoyi" }; + public static final String[] JOB_WHITELIST_STR = { "com.intc" }; /** * 定时任务违规的字符 */ public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml", - "org.springframework", "org.apache", "com.ruoyi.common.core.utils.file" }; + "org.springframework", "org.apache", "com.intc.common.core.utils.file" }; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/GenConstants.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/GenConstants.java index 19943fc..9ad5bf3 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/GenConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.constant; +package com.intc.common.core.constant; /** * 代码生成通用常量 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/HttpStatus.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/HttpStatus.java index 220a21f..e092119 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/HttpStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.constant; +package com.intc.common.core.constant; /** * 返回状态码 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/ScheduleConstants.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/ScheduleConstants.java index b264a07..5e9cb70 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/ScheduleConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.constant; +package com.intc.common.core.constant; /** * 任务调度通用常量 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/SecurityConstants.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/SecurityConstants.java index 75a6090..1f84e89 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/SecurityConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.constant; +package com.intc.common.core.constant; /** * 权限相关通用常量 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/ServiceNameConstants.java similarity index 84% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/ServiceNameConstants.java index 5ef62fe..da07691 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/ServiceNameConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.constant; +package com.intc.common.core.constant; /** * 服务名称 @@ -10,17 +10,17 @@ public class ServiceNameConstants /** * 认证服务的serviceid */ - public static final String AUTH_SERVICE = "ruoyi-auth"; + public static final String AUTH_SERVICE = "intc-auth"; /** * 系统模块的serviceid */ - public static final String SYSTEM_SERVICE = "ruoyi-system"; + public static final String SYSTEM_SERVICE = "intc-system"; /** * 文件服务的serviceid */ - public static final String FILE_SERVICE = "ruoyi-file"; + public static final String FILE_SERVICE = "intc-file"; /** * 系统模块的serviceid diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TagConstants.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/TagConstants.java similarity index 89% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TagConstants.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/TagConstants.java index 4a2028c..a2e9c07 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TagConstants.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/TagConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.constant; +package com.intc.common.core.constant; /** * 测点常量 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/TokenConstants.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/TokenConstants.java index e1e5c2f..be804f7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/TokenConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.constant; +package com.intc.common.core.constant; /** * Token的Key常量 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/UserConstants.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/UserConstants.java index 5d02f38..683efdb 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/UserConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.constant; +package com.intc.common.core.constant; /** * 用户常量信息 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/context/SecurityContextHolder.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/context/SecurityContextHolder.java index d7e94ec..b56ea95 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/context/SecurityContextHolder.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.context; +package com.intc.common.core.context; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import com.alibaba.ttl.TransmittableThreadLocal; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.constant.SecurityConstants; +import com.intc.common.core.text.Convert; +import com.intc.common.core.utils.StringUtils; /** * 获取当前线程变量中的 用户id、用户名称、Token等信息 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/R.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/R.java index 0003b19..7643516 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/domain/R.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.core.domain; +package com.intc.common.core.domain; import java.io.Serializable; -import com.ruoyi.common.core.constant.Constants; +import com.intc.common.core.constant.Constants; /** * 响应信息主体 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/UserStatus.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/UserStatus.java index 65a8cd8..ca90505 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/enums/UserStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.enums; +package com.intc.common.core.enums; /** * 用户状态 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/CaptchaException.java similarity index 85% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/CaptchaException.java index 8fa2ec0..b0178b5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/CaptchaException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception; +package com.intc.common.core.exception; /** * 验证码错误异常类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/CheckedException.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/CheckedException.java index c7f74cb..e550f59 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/CheckedException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception; +package com.intc.common.core.exception; /** * 检查异常 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/DemoModeException.java similarity index 83% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/DemoModeException.java index 6197e98..f3e7a1f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/DemoModeException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception; +package com.intc.common.core.exception; /** * 演示模式异常 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/GlobalException.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/GlobalException.java index b55c7cd..c7fd59b 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/GlobalException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception; +package com.intc.common.core.exception; /** * 全局异常 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/InnerAuthException.java similarity index 85% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/InnerAuthException.java index 96f825d..1e6296a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/InnerAuthException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception; +package com.intc.common.core.exception; /** * 内部认证异常 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/PreAuthorizeException.java similarity index 83% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/PreAuthorizeException.java index 3d420c4..d04d434 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/PreAuthorizeException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception; +package com.intc.common.core.exception; /** * 权限异常 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/ServiceException.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/ServiceException.java index 4983866..8e0783a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/ServiceException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception; +package com.intc.common.core.exception; /** * 业务异常 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/UtilException.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/UtilException.java index 18c7be8..e047097 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/UtilException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception; +package com.intc.common.core.exception; /** * 工具类异常 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/auth/NotLoginException.java similarity index 85% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/auth/NotLoginException.java index 01e5771..8dbceaa 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/auth/NotLoginException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception.auth; +package com.intc.common.core.exception.auth; /** * 未能通过的登录认证异常 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/auth/NotPermissionException.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/auth/NotPermissionException.java index 6e9d3db..2128cb4 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/auth/NotPermissionException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception.auth; +package com.intc.common.core.exception.auth; import org.apache.commons.lang3.StringUtils; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/auth/NotRoleException.java similarity index 89% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/auth/NotRoleException.java index 686374a..af36513 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/auth/NotRoleException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception.auth; +package com.intc.common.core.exception.auth; import org.apache.commons.lang3.StringUtils; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/base/BaseException.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/base/BaseException.java index 3d2fa10..18f312a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/base/BaseException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception.base; +package com.intc.common.core.exception.base; /** * 基础异常 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileException.java similarity index 72% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileException.java index 8989dcd..f9a2484 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileException.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.exception.file; +package com.intc.common.core.exception.file; -import com.ruoyi.common.core.exception.base.BaseException; +import com.intc.common.core.exception.base.BaseException; /** * 文件信息异常类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileNameLengthLimitExceededException.java similarity index 88% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileNameLengthLimitExceededException.java index 9135a00..1b40e7d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileNameLengthLimitExceededException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception.file; +package com.intc.common.core.exception.file; /** * 文件名称超长限制异常类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileSizeLimitExceededException.java similarity index 87% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileSizeLimitExceededException.java index a5f8bc1..6c86bd0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileSizeLimitExceededException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception.file; +package com.intc.common.core.exception.file; /** * 文件名大小限制异常类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileUploadException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileUploadException.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileUploadException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileUploadException.java index c0f57cb..314c229 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileUploadException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/FileUploadException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception.file; +package com.intc.common.core.exception.file; import java.io.PrintStream; import java.io.PrintWriter; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/InvalidExtensionException.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/InvalidExtensionException.java index 2a0b906..0ee419f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/file/InvalidExtensionException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception.file; +package com.intc.common.core.exception.file; import java.util.Arrays; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/job/TaskException.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/job/TaskException.java index 6cc3e58..6f72b66 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/job/TaskException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception.job; +package com.intc.common.core.exception.job; /** * 计划策略异常 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/CaptchaExpireException.java similarity index 85% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/CaptchaExpireException.java index ec68864..c66771d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/CaptchaExpireException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception.user; +package com.intc.common.core.exception.user; /** * 验证码失效异常类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/UserException.java similarity index 71% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/UserException.java index 8ae8ea3..4555894 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/UserException.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.exception.user; +package com.intc.common.core.exception.user; -import com.ruoyi.common.core.exception.base.BaseException; +import com.intc.common.core.exception.base.BaseException; /** * 用户信息异常类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/UserPasswordNotMatchException.java similarity index 87% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/UserPasswordNotMatchException.java index 2e1a6b1..7ee0b99 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/exception/user/UserPasswordNotMatchException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.exception.user; +package com.intc.common.core.exception.user; /** * 用户密码不正确或不符合规范异常类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/manager/AsyncManager.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/manager/AsyncManager.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/manager/AsyncManager.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/manager/AsyncManager.java index 33f2f7a..966b063 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/manager/AsyncManager.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/manager/AsyncManager.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.core.manager; +package com.intc.common.core.manager; -import com.ruoyi.common.core.utils.SpringUtils; +import com.intc.common.core.utils.SpringUtils; import java.util.TimerTask; import java.util.concurrent.ScheduledExecutorService; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/manager/Threads.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/manager/Threads.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/manager/Threads.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/manager/Threads.java index 46fe5de..b230087 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/manager/Threads.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/manager/Threads.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.manager; +package com.intc.common.core.manager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/sensitive/Sensitive.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/sensitive/Sensitive.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/sensitive/Sensitive.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/sensitive/Sensitive.java index b23b89f..932af32 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/sensitive/Sensitive.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/sensitive/Sensitive.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.sensitive; +package com.intc.common.core.sensitive; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/sensitive/SensitiveSerialize.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/sensitive/SensitiveSerialize.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/sensitive/SensitiveSerialize.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/sensitive/SensitiveSerialize.java index 08109d6..b65be46 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/sensitive/SensitiveSerialize.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/sensitive/SensitiveSerialize.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.sensitive; +package com.intc.common.core.sensitive; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.BeanProperty; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import com.ruoyi.common.core.utils.SensitiveUtils; +import com.intc.common.core.utils.SensitiveUtils; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/sensitive/SensitiveTypeEnum.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/sensitive/SensitiveTypeEnum.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/sensitive/SensitiveTypeEnum.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/sensitive/SensitiveTypeEnum.java index 284b7ec..083a684 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/sensitive/SensitiveTypeEnum.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/sensitive/SensitiveTypeEnum.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.sensitive; +package com.intc.common.core.sensitive; /** * 敏感信息枚举类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/text/CharsetKit.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/text/CharsetKit.java index 06fbcd5..6c09598 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/text/CharsetKit.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.core.text; +package com.intc.common.core.text; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; /** * 字符集工具类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/text/Convert.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/text/Convert.java index 2b18eb1..03a1d59 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/text/Convert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.text; +package com.intc.common.core.text; import java.math.BigDecimal; import java.math.BigInteger; @@ -6,7 +6,7 @@ import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.text.NumberFormat; import java.util.Set; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; /** * 类型转换器 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/text/StrFormatter.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/text/StrFormatter.java index cf366ea..a249ef7 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/text/StrFormatter.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.text; +package com.intc.common.core.text; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; /** * 字符串格式化 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/typehandler/ArrayLongTypeHandler.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/typehandler/ArrayLongTypeHandler.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/typehandler/ArrayLongTypeHandler.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/typehandler/ArrayLongTypeHandler.java index 6002fcb..a414687 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/typehandler/ArrayLongTypeHandler.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/typehandler/ArrayLongTypeHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.typehandler; +package com.intc.common.core.typehandler; import cn.hutool.json.JSONUtil; import org.apache.ibatis.type.BaseTypeHandler; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/typehandler/ArrayStringTypeHandler.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/typehandler/ArrayStringTypeHandler.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/typehandler/ArrayStringTypeHandler.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/typehandler/ArrayStringTypeHandler.java index 6dab677..7dbab56 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/typehandler/ArrayStringTypeHandler.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/typehandler/ArrayStringTypeHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.typehandler; +package com.intc.common.core.typehandler; import cn.hutool.json.JSONUtil; import org.apache.ibatis.type.BaseTypeHandler; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/typehandler/JsonTypeHandler.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/typehandler/JsonTypeHandler.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/typehandler/JsonTypeHandler.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/typehandler/JsonTypeHandler.java index b013bed..e06e50a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/typehandler/JsonTypeHandler.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/typehandler/JsonTypeHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.typehandler; +package com.intc.common.core.typehandler; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/DateUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/DateUtils.java index e0810f8..f497659 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.intc.common.core.utils; import org.apache.commons.lang3.time.DateFormatUtils; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ExceptionUtil.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ExceptionUtil.java index 12f6c72..5e06cb5 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ExceptionUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.intc.common.core.utils; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/IdWorker.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/IdWorker.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/IdWorker.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/IdWorker.java index 632918d..72d42ae 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/IdWorker.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/IdWorker.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.intc.common.core.utils; import org.springframework.stereotype.Component; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/JwtUtils.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/JwtUtils.java index d984892..2c42dee 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/JwtUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.utils; +package com.intc.common.core.utils; import java.util.Map; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.constant.TokenConstants; -import com.ruoyi.common.core.text.Convert; +import com.intc.common.core.constant.SecurityConstants; +import com.intc.common.core.constant.TokenConstants; +import com.intc.common.core.text.Convert; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ListUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ListUtils.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ListUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ListUtils.java index 77f3750..bde2d47 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ListUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ListUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.intc.common.core.utils; import java.util.ArrayList; import java.util.Iterator; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/LocalDateUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/LocalDateUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/LocalDateUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/LocalDateUtils.java index 915fe8c..273c719 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/LocalDateUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/LocalDateUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.intc.common.core.utils; import java.time.*; import java.time.format.DateTimeFormatter; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MillisecondsConverter.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/MillisecondsConverter.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MillisecondsConverter.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/MillisecondsConverter.java index 183865e..b9aa319 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MillisecondsConverter.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/MillisecondsConverter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.intc.common.core.utils; /** * 业务模块 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/PageUtils.java similarity index 80% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/PageUtils.java index 95ee25b..4af0fbe 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/PageUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.utils; +package com.intc.common.core.utils; import com.github.pagehelper.PageHelper; -import com.ruoyi.common.core.utils.sql.SqlUtil; -import com.ruoyi.common.core.web.page.PageDomain; -import com.ruoyi.common.core.web.page.TableSupport; +import com.intc.common.core.utils.sql.SqlUtil; +import com.intc.common.core.web.page.PageDomain; +import com.intc.common.core.web.page.TableSupport; /** * 分页工具类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/RedisCache.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/RedisCache.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/RedisCache.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/RedisCache.java index d3f11c4..9f95782 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/RedisCache.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/RedisCache.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.intc.common.core.utils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.BoundSetOperations; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SensitiveUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/SensitiveUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SensitiveUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/SensitiveUtils.java index 0412156..3bd1a4a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SensitiveUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/SensitiveUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.intc.common.core.utils; import cn.hutool.core.util.StrUtil; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ServletUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ServletUtils.java index 350c9a3..7dcbf8d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ServletUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.intc.common.core.utils; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -22,9 +22,9 @@ import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.text.Convert; +import com.intc.common.core.constant.Constants; +import com.intc.common.core.domain.R; +import com.intc.common.core.text.Convert; import reactor.core.publisher.Mono; /** diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/SpringUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/SpringUtils.java index e4ec3bc..3f94165 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/SpringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.intc.common.core.utils; import org.springframework.aop.framework.AopContext; import org.springframework.beans.BeansException; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/StringUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/StringUtils.java index 1e36a0f..16ab5c3 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/StringUtils.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.core.utils; +package com.intc.common.core.utils; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.text.StrFormatter; +import com.intc.common.core.constant.Constants; +import com.intc.common.core.text.StrFormatter; import org.springframework.util.AntPathMatcher; import java.util.Collection; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/TimeRangeUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/TimeRangeUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/TimeRangeUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/TimeRangeUtils.java index 0cb7e58..e03e43f 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/TimeRangeUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/TimeRangeUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils; +package com.intc.common.core.utils; import java.time.*; import java.time.format.DateTimeFormatter; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/bean/BeanUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/bean/BeanUtils.java index fba6032..66f17b9 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/bean/BeanUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.bean; +package com.intc.common.core.utils.bean; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/bean/BeanValidators.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/bean/BeanValidators.java index 18dccfa..e3755fa 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/bean/BeanValidators.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.bean; +package com.intc.common.core.utils.bean; import java.util.Set; import javax.validation.ConstraintViolation; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/coordinate/Gps.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/coordinate/Gps.java similarity index 92% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/coordinate/Gps.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/coordinate/Gps.java index 7fc8e64..8a50b0a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/coordinate/Gps.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/coordinate/Gps.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.coordinate; +package com.intc.common.core.utils.coordinate; public class Gps { diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/coordinate/PositionUtil.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/coordinate/PositionUtil.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/coordinate/PositionUtil.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/coordinate/PositionUtil.java index 09340c8..61862b2 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/coordinate/PositionUtil.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/coordinate/PositionUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.coordinate; +package com.intc.common.core.utils.coordinate; /** * 各地图API坐标系统比较与转换; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/file/FileTypeUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/file/FileTypeUtils.java index c36c306..988b960 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/file/FileTypeUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.file; +package com.intc.common.core.utils.file; import java.io.File; import java.util.Objects; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/file/FileUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/file/FileUtils.java index 75ec90c..3d1a55e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/file/FileUtils.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.utils.file; +package com.intc.common.core.utils.file; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; import org.apache.commons.lang3.ArrayUtils; import org.springframework.core.io.ClassPathResource; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/file/ImageUtils.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/file/ImageUtils.java index 940bff7..0ddcc1e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/file/ImageUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.file; +package com.intc.common.core.utils.file; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/file/MimeTypeUtils.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/file/MimeTypeUtils.java index 63385e0..1520c57 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/file/MimeTypeUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.file; +package com.intc.common.core.utils.file; /** * 媒体类型工具类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/html/EscapeUtil.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/html/EscapeUtil.java index 75716fb..4abd6f0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/html/EscapeUtil.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.utils.html; +package com.intc.common.core.utils.html; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; /** * 转义和反转义工具类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/html/HTMLFilter.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/html/HTMLFilter.java index 4d72b27..8dff9fe 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/html/HTMLFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.html; +package com.intc.common.core.utils.html; import java.util.ArrayList; import java.util.Collections; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/http/HttpHelper.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/http/HttpHelper.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/http/HttpHelper.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/http/HttpHelper.java index 17532db..e7d09d6 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/http/HttpHelper.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/http/HttpHelper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.http; +package com.intc.common.core.utils.http; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/http/HttpUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/http/HttpUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/http/HttpUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/http/HttpUtils.java index b43e18f..ba66117 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/http/HttpUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/http/HttpUtils.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.core.utils.http; +package com.intc.common.core.utils.http; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.constant.Constants; +import com.intc.common.core.utils.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ip/IpUtils.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ip/IpUtils.java index cf5108b..2839f40 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/ip/IpUtils.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.core.utils.ip; +package com.intc.common.core.utils.ip; import java.net.InetAddress; import java.net.UnknownHostException; import javax.servlet.http.HttpServletRequest; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.utils.ServletUtils; +import com.intc.common.core.utils.StringUtils; /** * 获取IP方法 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/poi/ExcelHandlerAdapter.java similarity index 88% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/poi/ExcelHandlerAdapter.java index ef51756..7995e21 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/poi/ExcelHandlerAdapter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.poi; +package com.intc.common.core.utils.poi; /** * Excel数据格式处理适配器 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/poi/ExcelUtil.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/poi/ExcelUtil.java index be6ec58..3a6f473 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/poi/ExcelUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.poi; +package com.intc.common.core.utils.poi; import java.io.IOException; import java.io.InputStream; @@ -51,16 +51,16 @@ import org.apache.poi.xssf.usermodel.XSSFClientAnchor; import org.apache.poi.xssf.usermodel.XSSFDataValidation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -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.annotation.Excels; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.file.FileTypeUtils; -import com.ruoyi.common.core.utils.file.ImageUtils; -import com.ruoyi.common.core.utils.reflect.ReflectUtils; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.annotation.Excel.ColumnType; +import com.intc.common.core.annotation.Excel.Type; +import com.intc.common.core.annotation.Excels; +import com.intc.common.core.text.Convert; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.file.FileTypeUtils; +import com.intc.common.core.utils.file.ImageUtils; +import com.intc.common.core.utils.reflect.ReflectUtils; /** * Excel相关处理 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/qrcode/MatrixToImageWriter.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/qrcode/MatrixToImageWriter.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/qrcode/MatrixToImageWriter.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/qrcode/MatrixToImageWriter.java index ffccb26..3ee4e90 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/qrcode/MatrixToImageWriter.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/qrcode/MatrixToImageWriter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.qrcode; +package com.intc.common.core.utils.qrcode; import com.google.zxing.common.BitMatrix; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/qrcode/QrCodeUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/qrcode/QrCodeUtils.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/qrcode/QrCodeUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/qrcode/QrCodeUtils.java index e5119d8..bde0879 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/qrcode/QrCodeUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/qrcode/QrCodeUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.qrcode; +package com.intc.common.core.utils.qrcode; import com.google.zxing.BarcodeFormat; import com.google.zxing.EncodeHintType; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/reflect/ReflectUtils.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/reflect/ReflectUtils.java index 5f1979b..11ce094 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/reflect/ReflectUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.reflect; +package com.intc.common.core.utils.reflect; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -12,8 +12,8 @@ import org.apache.commons.lang3.Validate; import org.apache.poi.ss.usermodel.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.DateUtils; +import com.intc.common.core.text.Convert; +import com.intc.common.core.utils.DateUtils; /** * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sign/Base64.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sign/Base64.java index 7599bc0..776b8f1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sign/Base64.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.sign; +package com.intc.common.core.utils.sign; /** * Base64工具类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sql/SqlUtil.java similarity index 91% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sql/SqlUtil.java index 1e58c91..3ec44b0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sql/SqlUtil.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.core.utils.sql; +package com.intc.common.core.utils.sql; -import com.ruoyi.common.core.exception.UtilException; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.exception.UtilException; +import com.intc.common.core.utils.StringUtils; /** * sql操作工具类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sunRiseSet/CalendarTime.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sunRiseSet/CalendarTime.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sunRiseSet/CalendarTime.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sunRiseSet/CalendarTime.java index 27810b4..e57c8df 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sunRiseSet/CalendarTime.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sunRiseSet/CalendarTime.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.sunRiseSet; +package com.intc.common.core.utils.sunRiseSet; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sunRiseSet/Common.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sunRiseSet/Common.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sunRiseSet/Common.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sunRiseSet/Common.java index 7a8a5ec..7e6ed35 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sunRiseSet/Common.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sunRiseSet/Common.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.sunRiseSet; +package com.intc.common.core.utils.sunRiseSet; import java.math.BigDecimal; import java.util.regex.Pattern; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sunRiseSet/GetSetData.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sunRiseSet/GetSetData.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sunRiseSet/GetSetData.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sunRiseSet/GetSetData.java index 69778fc..e9f7f5d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sunRiseSet/GetSetData.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sunRiseSet/GetSetData.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.sunRiseSet; +package com.intc.common.core.utils.sunRiseSet; import lombok.Data; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sunRiseSet/JulianCalendar.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sunRiseSet/JulianCalendar.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sunRiseSet/JulianCalendar.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sunRiseSet/JulianCalendar.java index d0f808e..f870609 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sunRiseSet/JulianCalendar.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sunRiseSet/JulianCalendar.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.sunRiseSet; +package com.intc.common.core.utils.sunRiseSet; /** * @Description: 儒略历（Julian calendar）是由罗马共和国独裁官儒略·恺撒（即盖乌斯·尤里乌斯·凯撒）采纳数学家兼天文学家索西琴尼的计算后， diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sunRiseSet/SunAndMoon.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sunRiseSet/SunAndMoon.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sunRiseSet/SunAndMoon.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sunRiseSet/SunAndMoon.java index 92e7001..f906fec 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sunRiseSet/SunAndMoon.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/sunRiseSet/SunAndMoon.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.sunRiseSet; +package com.intc.common.core.utils.sunRiseSet; import java.math.BigDecimal; import java.text.DecimalFormat; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/uuid/IdUtils.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/uuid/IdUtils.java index 32bb12d..878aba6 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/uuid/IdUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.utils.uuid; +package com.intc.common.core.utils.uuid; /** * ID生成器工具类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/uuid/Seq.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/uuid/Seq.java index 318cf6d..2bb3cef 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/uuid/Seq.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.core.utils.uuid; +package com.intc.common.core.utils.uuid; import java.util.concurrent.atomic.AtomicInteger; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.StringUtils; /** * @author ruoyi 序列生成类 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/uuid/UUID.java similarity index 99% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/uuid/UUID.java index 8f7323d..ae2e2ee 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/utils/uuid/UUID.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.utils.uuid; +package com.intc.common.core.utils.uuid; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; -import com.ruoyi.common.core.exception.UtilException; +import com.intc.common.core.exception.UtilException; /** * 提供通用唯一识别码（universally unique identifier）（UUID）实现 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/web/controller/BaseController.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/web/controller/BaseController.java index 2bfd8cb..b254523 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/web/controller/BaseController.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.web.controller; +package com.intc.common.core.web.controller; import java.beans.PropertyEditorSupport; import java.util.Date; @@ -8,11 +8,11 @@ import org.slf4j.LoggerFactory; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import com.github.pagehelper.PageInfo; -import com.ruoyi.common.core.constant.HttpStatus; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.PageUtils; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.constant.HttpStatus; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.PageUtils; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; /** * web层通用数据处理 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/web/domain/AjaxResult.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/web/domain/AjaxResult.java index 3442f9c..33bfa01 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/web/domain/AjaxResult.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.web.domain; +package com.intc.common.core.web.domain; import java.util.HashMap; import java.util.Objects; -import com.ruoyi.common.core.constant.HttpStatus; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.constant.HttpStatus; +import com.intc.common.core.utils.StringUtils; /** * 操作消息提醒 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/web/domain/BaseEntity.java similarity index 98% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/web/domain/BaseEntity.java index 7d68c9f..6c9d4d0 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/web/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.web.domain; +package com.intc.common.core.web.domain; import java.io.Serializable; import java.util.Date; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/web/domain/TreeEntity.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/web/domain/TreeEntity.java index 0481ced..4c8934c 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/web/domain/TreeEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.web.domain; +package com.intc.common.core.web.domain; import java.util.ArrayList; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/web/page/PageDomain.java similarity index 95% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/web/page/PageDomain.java index 31365c3..bcafa33 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/web/page/PageDomain.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.web.page; +package com.intc.common.core.web.page; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; /** * 分页数据 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/web/page/TableDataInfo.java similarity index 96% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/web/page/TableDataInfo.java index c294089..60b3862 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/web/page/TableDataInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.web.page; +package com.intc.common.core.web.page; import java.io.Serializable; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/web/page/TableSupport.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/web/page/TableSupport.java index 404be08..d9abcc1 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableSupport.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/web/page/TableSupport.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.core.web.page; +package com.intc.common.core.web.page; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.ServletUtils; +import com.intc.common.core.text.Convert; +import com.intc.common.core.utils.ServletUtils; /** * 表格数据处理 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/xss/Xss.java similarity index 94% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/xss/Xss.java index 28fc30b..a781105 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/xss/Xss.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.xss; +package com.intc.common.core.xss; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java b/intc-common/intc-common-core/src/main/java/com/intc/common/core/xss/XssValidator.java similarity index 90% rename from ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java rename to intc-common/intc-common-core/src/main/java/com/intc/common/core/xss/XssValidator.java index a0b1861..559f703 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java +++ b/intc-common/intc-common-core/src/main/java/com/intc/common/core/xss/XssValidator.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.core.xss; +package com.intc.common.core.xss; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; /** * 自定义xss校验注解实现 diff --git a/intc-common/intc-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..3454652 --- /dev/null +++ b/intc-common/intc-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.intc.common.core.utils.SpringUtils diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/intc-common/intc-common-datascope/pom.xml similarity index 67% rename from ruoyi-common/ruoyi-common-datascope/pom.xml rename to intc-common/intc-common-datascope/pom.xml index 7adbd6d..7131f25 100644 --- a/ruoyi-common/ruoyi-common-datascope/pom.xml +++ b/intc-common/intc-common-datascope/pom.xml @@ -3,24 +3,24 @@ 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"> - com.ruoyi - ruoyi-common + com.intc + intc-common 3.6.3 4.0.0 - ruoyi-common-datascope + intc-common-datascope - ruoyi-common-datascope权限范围 + intc-common-datascope权限范围 - com.ruoyi - ruoyi-common-security + com.intc + intc-common-security 3.6.3 diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java b/intc-common/intc-common-datascope/src/main/java/com/intc/common/datascope/annotation/DataScope.java similarity index 94% rename from ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java rename to intc-common/intc-common-datascope/src/main/java/com/intc/common/datascope/annotation/DataScope.java index 0afc005..819a1ac 100644 --- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java +++ b/intc-common/intc-common-datascope/src/main/java/com/intc/common/datascope/annotation/DataScope.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.datascope.annotation; +package com.intc.common.datascope.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java b/intc-common/intc-common-datascope/src/main/java/com/intc/common/datascope/aspect/DataScopeAspect.java similarity index 92% rename from ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java rename to intc-common/intc-common-datascope/src/main/java/com/intc/common/datascope/aspect/DataScopeAspect.java index d88c838..37acd10 100644 --- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java +++ b/intc-common/intc-common-datascope/src/main/java/com/intc/common/datascope/aspect/DataScopeAspect.java @@ -1,14 +1,14 @@ -package com.ruoyi.common.datascope.aspect; +package com.intc.common.datascope.aspect; -import com.ruoyi.common.core.context.SecurityContextHolder; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.web.domain.BaseEntity; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysRole; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.api.model.LoginUser; +import com.intc.common.core.context.SecurityContextHolder; +import com.intc.common.core.text.Convert; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.web.domain.BaseEntity; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.api.domain.SysRole; +import com.intc.system.api.domain.SysUser; +import com.intc.system.api.model.LoginUser; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; diff --git a/intc-common/intc-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..d1c6e28 --- /dev/null +++ b/intc-common/intc-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.intc.common.datascope.aspect.DataScopeAspect diff --git a/ruoyi-common/ruoyi-common-datasource/pom.xml b/intc-common/intc-common-datasource/pom.xml similarity index 83% rename from ruoyi-common/ruoyi-common-datasource/pom.xml rename to intc-common/intc-common-datasource/pom.xml index 53207ec..f46fa09 100644 --- a/ruoyi-common/ruoyi-common-datasource/pom.xml +++ b/intc-common/intc-common-datasource/pom.xml @@ -3,16 +3,16 @@ 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"> - com.ruoyi - ruoyi-common + com.intc + intc-common 3.6.3 4.0.0 - ruoyi-common-datasource + intc-common-datasource - ruoyi-common-datasource多数据源 + intc-common-datasource多数据源 diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java b/intc-common/intc-common-datasource/src/main/java/com/intc/common/datasource/annotation/Master.java similarity index 90% rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java rename to intc-common/intc-common-datasource/src/main/java/com/intc/common/datasource/annotation/Master.java index c71c105..c162a28 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Master.java +++ b/intc-common/intc-common-datasource/src/main/java/com/intc/common/datasource/annotation/Master.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.datasource.annotation; +package com.intc.common.datasource.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java b/intc-common/intc-common-datasource/src/main/java/com/intc/common/datasource/annotation/Slave.java similarity index 90% rename from ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java rename to intc-common/intc-common-datasource/src/main/java/com/intc/common/datasource/annotation/Slave.java index bc45f6f..e642ab0 100644 --- a/ruoyi-common/ruoyi-common-datasource/src/main/java/com/ruoyi/common/datasource/annotation/Slave.java +++ b/intc-common/intc-common-datasource/src/main/java/com/intc/common/datasource/annotation/Slave.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.datasource.annotation; +package com.intc.common.datasource.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/intc-common/intc-common-log/pom.xml similarity index 68% rename from ruoyi-common/ruoyi-common-log/pom.xml rename to intc-common/intc-common-log/pom.xml index 082f195..9838307 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/intc-common/intc-common-log/pom.xml @@ -3,24 +3,24 @@ 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"> - com.ruoyi - ruoyi-common + com.intc + intc-common 3.6.3 4.0.0 - ruoyi-common-log + intc-common-log - ruoyi-common-log日志记录 + intc-common-log日志记录 - com.ruoyi - ruoyi-common-security + com.intc + intc-common-security 3.6.3 diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java b/intc-common/intc-common-log/src/main/java/com/intc/common/log/annotation/Log.java similarity index 87% rename from ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java rename to intc-common/intc-common-log/src/main/java/com/intc/common/log/annotation/Log.java index 4497ce6..0678162 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/annotation/Log.java +++ b/intc-common/intc-common-log/src/main/java/com/intc/common/log/annotation/Log.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.log.annotation; +package com.intc.common.log.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.log.enums.OperatorType; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.log.enums.OperatorType; /** * 自定义操作日志记录注解 diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java b/intc-common/intc-common-log/src/main/java/com/intc/common/log/aspect/LogAspect.java similarity index 94% rename from ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java rename to intc-common/intc-common-log/src/main/java/com/intc/common/log/aspect/LogAspect.java index e4f2dd0..19cefef 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java +++ b/intc-common/intc-common-log/src/main/java/com/intc/common/log/aspect/LogAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.log.aspect; +package com.intc.common.log.aspect; import java.util.Collection; import java.util.Map; @@ -19,15 +19,15 @@ import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.ip.IpUtils; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessStatus; -import com.ruoyi.common.log.filter.PropertyPreExcludeFilter; -import com.ruoyi.common.log.service.AsyncLogService; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysOperLog; +import com.intc.common.core.utils.ServletUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.ip.IpUtils; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessStatus; +import com.intc.common.log.filter.PropertyPreExcludeFilter; +import com.intc.common.log.service.AsyncLogService; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.api.domain.SysOperLog; /** * 操作日志记录处理 diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java b/intc-common/intc-common-log/src/main/java/com/intc/common/log/enums/BusinessStatus.java similarity index 82% rename from ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java rename to intc-common/intc-common-log/src/main/java/com/intc/common/log/enums/BusinessStatus.java index a2a3926..d45058f 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessStatus.java +++ b/intc-common/intc-common-log/src/main/java/com/intc/common/log/enums/BusinessStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.log.enums; +package com.intc.common.log.enums; /** * 操作状态 diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java b/intc-common/intc-common-log/src/main/java/com/intc/common/log/enums/BusinessType.java similarity index 93% rename from ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java rename to intc-common/intc-common-log/src/main/java/com/intc/common/log/enums/BusinessType.java index 0b18de8..df78ea2 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/BusinessType.java +++ b/intc-common/intc-common-log/src/main/java/com/intc/common/log/enums/BusinessType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.log.enums; +package com.intc.common.log.enums; /** * 业务操作类型 diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java b/intc-common/intc-common-log/src/main/java/com/intc/common/log/enums/OperatorType.java similarity index 85% rename from ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java rename to intc-common/intc-common-log/src/main/java/com/intc/common/log/enums/OperatorType.java index 2a041a0..3ea4283 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/enums/OperatorType.java +++ b/intc-common/intc-common-log/src/main/java/com/intc/common/log/enums/OperatorType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.log.enums; +package com.intc.common.log.enums; /** * 操作人类别 diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java b/intc-common/intc-common-log/src/main/java/com/intc/common/log/filter/PropertyPreExcludeFilter.java similarity index 92% rename from ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java rename to intc-common/intc-common-log/src/main/java/com/intc/common/log/filter/PropertyPreExcludeFilter.java index 0327a24..714a504 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/filter/PropertyPreExcludeFilter.java +++ b/intc-common/intc-common-log/src/main/java/com/intc/common/log/filter/PropertyPreExcludeFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.log.filter; +package com.intc.common.log.filter; import com.alibaba.fastjson2.filter.SimplePropertyPreFilter; diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java b/intc-common/intc-common-log/src/main/java/com/intc/common/log/service/AsyncLogService.java similarity index 73% rename from ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java rename to intc-common/intc-common-log/src/main/java/com/intc/common/log/service/AsyncLogService.java index a52927c..3dfa02b 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/service/AsyncLogService.java +++ b/intc-common/intc-common-log/src/main/java/com/intc/common/log/service/AsyncLogService.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.log.service; +package com.intc.common.log.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.system.api.RemoteLogService; -import com.ruoyi.system.api.domain.SysOperLog; +import com.intc.common.core.constant.SecurityConstants; +import com.intc.system.api.RemoteLogService; +import com.intc.system.api.domain.SysOperLog; /** * 异步调用日志服务 diff --git a/intc-common/intc-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..f8656ff --- /dev/null +++ b/intc-common/intc-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.intc.common.log.service.AsyncLogService +com.intc.common.log.aspect.LogAspect diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/intc-common/intc-common-redis/pom.xml similarity index 74% rename from ruoyi-common/ruoyi-common-redis/pom.xml rename to intc-common/intc-common-redis/pom.xml index cfeb9dd..186b23d 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/intc-common/intc-common-redis/pom.xml @@ -3,16 +3,16 @@ 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"> - com.ruoyi - ruoyi-common + com.intc + intc-common 3.6.3 4.0.0 - ruoyi-common-redis + intc-common-redis - ruoyi-common-redis缓存服务 + intc-common-redis缓存服务 @@ -25,8 +25,8 @@ - com.ruoyi - ruoyi-common-core + com.intc + intc-common-core 3.6.3 diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/configure/FastJson2JsonRedisSerializer.java similarity index 96% rename from ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java rename to intc-common/intc-common-redis/src/main/java/com/intc/common/redis/configure/FastJson2JsonRedisSerializer.java index 80e1be4..c2b4e3f 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/FastJson2JsonRedisSerializer.java +++ b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/configure/FastJson2JsonRedisSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.redis.configure; +package com.intc.common.redis.configure; import java.nio.charset.Charset; import org.springframework.data.redis.serializer.RedisSerializer; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/configure/RedisConfig.java similarity index 97% rename from ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java rename to intc-common/intc-common-redis/src/main/java/com/intc/common/redis/configure/RedisConfig.java index 6e1ec8a..d014c46 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java +++ b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/configure/RedisConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.redis.configure; +package com.intc.common.redis.configure; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/service/RedisService.java similarity index 99% rename from ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java rename to intc-common/intc-common-redis/src/main/java/com/intc/common/redis/service/RedisService.java index b1843ed..0fb5c53 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/service/RedisService.java +++ b/intc-common/intc-common-redis/src/main/java/com/intc/common/redis/service/RedisService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.redis.service; +package com.intc.common.redis.service; import java.util.*; import java.util.concurrent.TimeUnit; diff --git a/intc-common/intc-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..d5984a5 --- /dev/null +++ b/intc-common/intc-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.intc.common.redis.configure.RedisConfig +com.intc.common.redis.service.RedisService diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/intc-common/intc-common-seata/pom.xml similarity index 78% rename from ruoyi-common/ruoyi-common-seata/pom.xml rename to intc-common/intc-common-seata/pom.xml index f19b2e1..38089bc 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/intc-common/intc-common-seata/pom.xml @@ -3,16 +3,16 @@ 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"> - com.ruoyi - ruoyi-common + com.intc + intc-common 3.6.3 4.0.0 - ruoyi-common-seata + intc-common-seata - ruoyi-common-seata分布式事务 + intc-common-seata分布式事务 diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/intc-common/intc-common-security/pom.xml similarity index 69% rename from ruoyi-common/ruoyi-common-security/pom.xml rename to intc-common/intc-common-security/pom.xml index 5132f66..ada3f3f 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/intc-common/intc-common-security/pom.xml @@ -2,16 +2,16 @@ - com.ruoyi - ruoyi-common + com.intc + intc-common 3.6.3 4.0.0 - ruoyi-common-security + intc-common-security - ruoyi-common-security安全模块 + intc-common-security安全模块 @@ -24,15 +24,15 @@ - com.ruoyi - ruoyi-api-system + com.intc + intc-api-system 3.6.3 - com.ruoyi - ruoyi-common-redis + com.intc + intc-common-redis 3.6.3 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/EnableCustomConfig.java similarity index 77% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/EnableCustomConfig.java index 5e7698f..a883d4c 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableCustomConfig.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/EnableCustomConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.annotation; +package com.intc.common.security.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -7,13 +7,13 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ruoyi.common.security.config.JacksonConfig; +import com.intc.common.security.config.JacksonConfig; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableAsync; -import com.ruoyi.common.security.config.ApplicationConfig; -import com.ruoyi.common.security.feign.FeignAutoConfiguration; +import com.intc.common.security.config.ApplicationConfig; +import com.intc.common.security.feign.FeignAutoConfiguration; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @@ -22,7 +22,7 @@ import com.ruoyi.common.security.feign.FeignAutoConfiguration; // 表示通过aop框架暴露该代理对象,AopContext能够访问 @EnableAspectJAutoProxy(exposeProxy = true) // 指定要扫描的Mapper类的包的路径 -@MapperScan("com.ruoyi.**.mapper") +@MapperScan("com.intc.**.mapper") // 开启线程异步执行 @EnableAsync // 自动加载类 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/EnableRyFeignClients.java similarity index 83% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/EnableRyFeignClients.java index 4eb416e..aaf2094 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/EnableRyFeignClients.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.annotation; +package com.intc.common.security.annotation; import org.springframework.cloud.openfeign.EnableFeignClients; import java.lang.annotation.*; @@ -17,7 +17,7 @@ public @interface EnableRyFeignClients { String[] value() default {}; - String[] basePackages() default { "com.ruoyi" }; + String[] basePackages() default { "com.intc" }; Class[] basePackageClasses() default {}; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/InnerAuth.java similarity index 85% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/InnerAuth.java index 6eada07..d099d2b 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/InnerAuth.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/InnerAuth.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.annotation; +package com.intc.common.security.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/Logical.java similarity index 82% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/Logical.java index 4b787a0..707f707 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/Logical.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.annotation; +package com.intc.common.security.annotation; /** * 权限注解的验证模式 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/RequiresLogin.java similarity index 89% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/RequiresLogin.java index f196ff5..03b1df1 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresLogin.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/RequiresLogin.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.annotation; +package com.intc.common.security.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/RequiresPermissions.java similarity index 92% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/RequiresPermissions.java index aef624d..4e8d13e 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/RequiresPermissions.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.annotation; +package com.intc.common.security.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/RequiresRoles.java similarity index 92% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/RequiresRoles.java index 042e4c2..17a95e2 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresRoles.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/annotation/RequiresRoles.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.annotation; +package com.intc.common.security.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/aspect/InnerAuthAspect.java similarity index 82% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/aspect/InnerAuthAspect.java index 82d8b03..ed2e744 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/InnerAuthAspect.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/aspect/InnerAuthAspect.java @@ -1,15 +1,15 @@ -package com.ruoyi.common.security.aspect; +package com.intc.common.security.aspect; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.springframework.core.Ordered; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.exception.InnerAuthException; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.annotation.InnerAuth; +import com.intc.common.core.constant.SecurityConstants; +import com.intc.common.core.exception.InnerAuthException; +import com.intc.common.core.utils.ServletUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.annotation.InnerAuth; /** * 内部服务调用验证处理 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/aspect/PreAuthorizeAspect.java similarity index 81% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/aspect/PreAuthorizeAspect.java index bc75873..9cc602d 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/aspect/PreAuthorizeAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.aspect; +package com.intc.common.security.aspect; import java.lang.reflect.Method; import org.aspectj.lang.ProceedingJoinPoint; @@ -7,10 +7,10 @@ import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.stereotype.Component; -import com.ruoyi.common.security.annotation.RequiresLogin; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.annotation.RequiresRoles; -import com.ruoyi.common.security.auth.AuthUtil; +import com.intc.common.security.annotation.RequiresLogin; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.common.security.annotation.RequiresRoles; +import com.intc.common.security.auth.AuthUtil; /** * 基于 Spring Aop 的注解鉴权 @@ -31,9 +31,9 @@ public class PreAuthorizeAspect /** * 定义AOP签名 (切入所有使用鉴权注解的方法) */ - public static final String POINTCUT_SIGN = " @annotation(com.ruoyi.common.security.annotation.RequiresLogin) || " - + "@annotation(com.ruoyi.common.security.annotation.RequiresPermissions) || " - + "@annotation(com.ruoyi.common.security.annotation.RequiresRoles)"; + public static final String POINTCUT_SIGN = " @annotation(com.intc.common.security.annotation.RequiresLogin) || " + + "@annotation(com.intc.common.security.annotation.RequiresPermissions) || " + + "@annotation(com.intc.common.security.annotation.RequiresRoles)"; /** * 声明AOP签名 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/auth/AuthLogic.java similarity index 91% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/auth/AuthLogic.java index fa04637..2a03376 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/auth/AuthLogic.java @@ -1,22 +1,22 @@ -package com.ruoyi.common.security.auth; +package com.intc.common.security.auth; import java.util.Collection; import java.util.HashSet; import java.util.Set; import org.springframework.util.PatternMatchUtils; -import com.ruoyi.common.core.context.SecurityContextHolder; -import com.ruoyi.common.core.exception.auth.NotLoginException; -import com.ruoyi.common.core.exception.auth.NotPermissionException; -import com.ruoyi.common.core.exception.auth.NotRoleException; -import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.annotation.Logical; -import com.ruoyi.common.security.annotation.RequiresLogin; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.annotation.RequiresRoles; -import com.ruoyi.common.security.service.TokenService; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.model.LoginUser; +import com.intc.common.core.context.SecurityContextHolder; +import com.intc.common.core.exception.auth.NotLoginException; +import com.intc.common.core.exception.auth.NotPermissionException; +import com.intc.common.core.exception.auth.NotRoleException; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.annotation.Logical; +import com.intc.common.security.annotation.RequiresLogin; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.common.security.annotation.RequiresRoles; +import com.intc.common.security.service.TokenService; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.api.model.LoginUser; /** * Token 权限验证，逻辑实现类 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/auth/AuthUtil.java similarity index 94% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/auth/AuthUtil.java index 8b0d86c..e81ab5b 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/auth/AuthUtil.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.security.auth; +package com.intc.common.security.auth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.annotation.RequiresRoles; -import com.ruoyi.system.api.model.LoginUser; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.common.security.annotation.RequiresRoles; +import com.intc.system.api.model.LoginUser; /** * Token 权限验证工具类 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/config/ApplicationConfig.java similarity index 92% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/config/ApplicationConfig.java index 5ae8d14..1f783ac 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.config; +package com.intc.common.security.config; import java.util.TimeZone; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/JacksonConfig.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/config/JacksonConfig.java similarity index 97% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/JacksonConfig.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/config/JacksonConfig.java index 349fdbc..022497e 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/JacksonConfig.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/config/JacksonConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.config; +package com.intc.common.security.config; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.MapperFeature; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/config/WebMvcConfig.java similarity index 88% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/config/WebMvcConfig.java index 46adfd9..c984258 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/WebMvcConfig.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/config/WebMvcConfig.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.security.config; +package com.intc.common.security.config; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.ruoyi.common.security.interceptor.HeaderInterceptor; +import com.intc.common.security.interceptor.HeaderInterceptor; /** * 拦截器配置 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/feign/FeignAutoConfiguration.java similarity index 90% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/feign/FeignAutoConfiguration.java index 304798d..2c0f29c 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignAutoConfiguration.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/feign/FeignAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.feign; +package com.intc.common.security.feign; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/feign/FeignRequestInterceptor.java similarity index 87% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/feign/FeignRequestInterceptor.java index 33e12c6..d993023 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/feign/FeignRequestInterceptor.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.security.feign; +package com.intc.common.security.feign; import java.util.Map; import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.ip.IpUtils; +import com.intc.common.core.constant.SecurityConstants; +import com.intc.common.core.utils.ServletUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.ip.IpUtils; import feign.RequestInterceptor; import feign.RequestTemplate; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/DictHandler.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/handler/DictHandler.java similarity index 73% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/DictHandler.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/handler/DictHandler.java index 57c94e1..65bfe9e 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/DictHandler.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/handler/DictHandler.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.security.handler; +package com.intc.common.security.handler; -import com.ruoyi.common.core.utils.poi.ExcelHandlerAdapter; -import com.ruoyi.common.security.utils.DictUtils; -import com.ruoyi.system.api.domain.SysDictData; +import com.intc.common.core.utils.poi.ExcelHandlerAdapter; +import com.intc.common.security.utils.DictUtils; +import com.intc.system.api.domain.SysDictData; import org.springframework.stereotype.Component; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/handler/GlobalExceptionHandler.java similarity index 89% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/handler/GlobalExceptionHandler.java index 159cfce..48fb5e3 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/handler/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.handler; +package com.intc.common.security.handler; import javax.servlet.http.HttpServletRequest; import org.slf4j.Logger; @@ -8,14 +8,14 @@ import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; -import com.ruoyi.common.core.constant.HttpStatus; -import com.ruoyi.common.core.exception.DemoModeException; -import com.ruoyi.common.core.exception.InnerAuthException; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.exception.auth.NotPermissionException; -import com.ruoyi.common.core.exception.auth.NotRoleException; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.web.domain.AjaxResult; +import com.intc.common.core.constant.HttpStatus; +import com.intc.common.core.exception.DemoModeException; +import com.intc.common.core.exception.InnerAuthException; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.exception.auth.NotPermissionException; +import com.intc.common.core.exception.auth.NotRoleException; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.web.domain.AjaxResult; /** * 全局异常处理器 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/interceptor/HeaderInterceptor.java similarity index 80% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/interceptor/HeaderInterceptor.java index 18c8d2b..f3daafb 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/interceptor/HeaderInterceptor.java @@ -1,16 +1,16 @@ -package com.ruoyi.common.security.interceptor; +package com.intc.common.security.interceptor; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.AsyncHandlerInterceptor; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.context.SecurityContextHolder; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.auth.AuthUtil; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.model.LoginUser; +import com.intc.common.core.constant.SecurityConstants; +import com.intc.common.core.context.SecurityContextHolder; +import com.intc.common.core.utils.ServletUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.auth.AuthUtil; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.api.model.LoginUser; /** * 自定义请求头拦截器，将Header数据封装到线程变量中方便获取 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/service/TokenService.java similarity index 88% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/service/TokenService.java index 139ee8b..f20eb78 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/service/TokenService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.security.service; +package com.intc.common.security.service; import java.util.HashMap; import java.util.Map; @@ -6,16 +6,16 @@ import java.util.concurrent.TimeUnit; import javax.servlet.http.HttpServletRequest; 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.SecurityConstants; -import com.ruoyi.common.core.utils.JwtUtils; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.ip.IpUtils; -import com.ruoyi.common.core.utils.uuid.IdUtils; -import com.ruoyi.common.redis.service.RedisService; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.model.LoginUser; +import com.intc.common.core.constant.CacheConstants; +import com.intc.common.core.constant.SecurityConstants; +import com.intc.common.core.utils.JwtUtils; +import com.intc.common.core.utils.ServletUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.ip.IpUtils; +import com.intc.common.core.utils.uuid.IdUtils; +import com.intc.common.redis.service.RedisService; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.api.model.LoginUser; /** * token验证处理 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/utils/DictUtils.java similarity index 92% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/utils/DictUtils.java index 07aafc8..4571966 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/DictUtils.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/utils/DictUtils.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.security.utils; +package com.intc.common.security.utils; import java.util.Collection; import java.util.List; import com.alibaba.fastjson2.JSONArray; -import com.ruoyi.common.core.constant.CacheConstants; -import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.redis.service.RedisService; -import com.ruoyi.system.api.domain.SysDictData; +import com.intc.common.core.constant.CacheConstants; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.redis.service.RedisService; +import com.intc.system.api.domain.SysDictData; /** * 字典工具类 diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java b/intc-common/intc-common-security/src/main/java/com/intc/common/security/utils/SecurityUtils.java similarity index 87% rename from ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java rename to intc-common/intc-common-security/src/main/java/com/intc/common/security/utils/SecurityUtils.java index 868d443..c028406 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java +++ b/intc-common/intc-common-security/src/main/java/com/intc/common/security/utils/SecurityUtils.java @@ -1,15 +1,15 @@ -package com.ruoyi.common.security.utils; +package com.intc.common.security.utils; import javax.servlet.http.HttpServletRequest; -import com.ruoyi.system.api.domain.SysUser; +import com.intc.system.api.domain.SysUser; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.constant.TokenConstants; -import com.ruoyi.common.core.context.SecurityContextHolder; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.system.api.model.LoginUser; +import com.intc.common.core.constant.SecurityConstants; +import com.intc.common.core.constant.TokenConstants; +import com.intc.common.core.context.SecurityContextHolder; +import com.intc.common.core.utils.ServletUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.system.api.model.LoginUser; import java.util.Optional; diff --git a/intc-common/intc-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..f52845e --- /dev/null +++ b/intc-common/intc-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,5 @@ +com.intc.common.security.config.WebMvcConfig +com.intc.common.security.service.TokenService +com.intc.common.security.aspect.PreAuthorizeAspect +com.intc.common.security.aspect.InnerAuthAspect +com.intc.common.security.handler.GlobalExceptionHandler diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/intc-common/intc-common-swagger/pom.xml similarity index 83% rename from ruoyi-common/ruoyi-common-swagger/pom.xml rename to intc-common/intc-common-swagger/pom.xml index 8705d46..b84e15c 100644 --- a/ruoyi-common/ruoyi-common-swagger/pom.xml +++ b/intc-common/intc-common-swagger/pom.xml @@ -3,16 +3,16 @@ 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"> - com.ruoyi - ruoyi-common + com.intc + intc-common 3.6.3 4.0.0 - ruoyi-common-swagger + intc-common-swagger - ruoyi-common-swagger系统接口 + intc-common-swagger系统接口 diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/annotation/EnableCustomSwagger2.java b/intc-common/intc-common-swagger/src/main/java/com/intc/common/swagger/annotation/EnableCustomSwagger2.java similarity index 81% rename from ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/annotation/EnableCustomSwagger2.java rename to intc-common/intc-common-swagger/src/main/java/com/intc/common/swagger/annotation/EnableCustomSwagger2.java index 83bb3d7..ecb5f1d 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/annotation/EnableCustomSwagger2.java +++ b/intc-common/intc-common-swagger/src/main/java/com/intc/common/swagger/annotation/EnableCustomSwagger2.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.swagger.annotation; +package com.intc.common.swagger.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -7,7 +7,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.context.annotation.Import; -import com.ruoyi.common.swagger.config.SwaggerAutoConfiguration; +import com.intc.common.swagger.config.SwaggerAutoConfiguration; @Target({ ElementType.TYPE }) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java b/intc-common/intc-common-swagger/src/main/java/com/intc/common/swagger/config/SwaggerAutoConfiguration.java similarity index 99% rename from ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java rename to intc-common/intc-common-swagger/src/main/java/com/intc/common/swagger/config/SwaggerAutoConfiguration.java index 6933749..1b8f0cd 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerAutoConfiguration.java +++ b/intc-common/intc-common-swagger/src/main/java/com/intc/common/swagger/config/SwaggerAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.swagger.config; +package com.intc.common.swagger.config; import java.util.ArrayList; import java.util.Arrays; diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java b/intc-common/intc-common-swagger/src/main/java/com/intc/common/swagger/config/SwaggerBeanPostProcessor.java similarity index 97% rename from ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java rename to intc-common/intc-common-swagger/src/main/java/com/intc/common/swagger/config/SwaggerBeanPostProcessor.java index 1c76ff8..f58b291 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerBeanPostProcessor.java +++ b/intc-common/intc-common-swagger/src/main/java/com/intc/common/swagger/config/SwaggerBeanPostProcessor.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.swagger.config; +package com.intc.common.swagger.config; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerProperties.java b/intc-common/intc-common-swagger/src/main/java/com/intc/common/swagger/config/SwaggerProperties.java similarity index 99% rename from ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerProperties.java rename to intc-common/intc-common-swagger/src/main/java/com/intc/common/swagger/config/SwaggerProperties.java index 11177e7..389479c 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerProperties.java +++ b/intc-common/intc-common-swagger/src/main/java/com/intc/common/swagger/config/SwaggerProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.swagger.config; +package com.intc.common.swagger.config; import java.util.ArrayList; import java.util.List; diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java b/intc-common/intc-common-swagger/src/main/java/com/intc/common/swagger/config/SwaggerWebConfiguration.java similarity index 94% rename from ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java rename to intc-common/intc-common-swagger/src/main/java/com/intc/common/swagger/config/SwaggerWebConfiguration.java index 424e8c3..f1d246a 100644 --- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SwaggerWebConfiguration.java +++ b/intc-common/intc-common-swagger/src/main/java/com/intc/common/swagger/config/SwaggerWebConfiguration.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.swagger.config; +package com.intc.common.swagger.config; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; diff --git a/intc-common/intc-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/intc-common/intc-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..55644b5 --- /dev/null +++ b/intc-common/intc-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +com.intc.common.swagger.config.SwaggerAutoConfiguration +com.intc.common.swagger.config.SwaggerWebConfiguration +com.intc.common.swagger.config.SwaggerBeanPostProcessor diff --git a/intc-common/pom.xml b/intc-common/pom.xml new file mode 100644 index 0000000..6a17cb9 --- /dev/null +++ b/intc-common/pom.xml @@ -0,0 +1,29 @@ + + + + com.intc + intc + 3.6.3 + + 4.0.0 + + + intc-common-log + intc-common-core + intc-common-redis + intc-common-seata + intc-common-swagger + intc-common-security + intc-common-datascope + intc-common-datasource + + + intc-common + pom + + + intc-common通用模块 + + + diff --git a/ruoyi-gateway/pom.xml b/intc-gateway/pom.xml similarity index 93% rename from ruoyi-gateway/pom.xml rename to intc-gateway/pom.xml index c9943d4..07cd285 100644 --- a/ruoyi-gateway/pom.xml +++ b/intc-gateway/pom.xml @@ -2,16 +2,16 @@ 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"> - com.ruoyi - ruoyi + com.intc + intc 3.6.3 4.0.0 - ruoyi-gateway + intc-gateway - ruoyi-gateway网关模块 + intc-gateway网关模块 @@ -79,8 +79,8 @@ - com.ruoyi - ruoyi-common-redis + com.intc + intc-common-redis 3.6.3 diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java b/intc-gateway/src/main/java/com/intc/gateway/IntcGatewayApplication.java similarity index 88% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java rename to intc-gateway/src/main/java/com/intc/gateway/IntcGatewayApplication.java index 3c54b77..2275ec5 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java +++ b/intc-gateway/src/main/java/com/intc/gateway/IntcGatewayApplication.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway; +package com.intc.gateway; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -10,11 +10,11 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * @author ruoyi */ @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) -public class RuoYiGatewayApplication +public class IntcGatewayApplication { public static void main(String[] args) { - SpringApplication.run(RuoYiGatewayApplication.class, args); + SpringApplication.run(IntcGatewayApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 若依网关启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java b/intc-gateway/src/main/java/com/intc/gateway/config/CaptchaConfig.java similarity index 96% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java rename to intc-gateway/src/main/java/com/intc/gateway/config/CaptchaConfig.java index e6c6d9d..681be9a 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CaptchaConfig.java +++ b/intc-gateway/src/main/java/com/intc/gateway/config/CaptchaConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.config; +package com.intc.gateway.config; import java.util.Properties; import org.springframework.context.annotation.Bean; @@ -63,7 +63,7 @@ public class CaptchaConfig // KAPTCHA_SESSION_KEY properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath"); // 验证码文本生成器 - properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.ruoyi.gateway.config.KaptchaTextCreator"); + properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.intc.gateway.config.KaptchaTextCreator"); // 验证码文本字符间距 默认为2 properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3"); // 验证码文本字符长度 默认为5 diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CorsConfig.java b/intc-gateway/src/main/java/com/intc/gateway/config/CorsConfig.java similarity index 98% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CorsConfig.java rename to intc-gateway/src/main/java/com/intc/gateway/config/CorsConfig.java index 4b4abd2..b869222 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/CorsConfig.java +++ b/intc-gateway/src/main/java/com/intc/gateway/config/CorsConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.config; +package com.intc.gateway.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java b/intc-gateway/src/main/java/com/intc/gateway/config/GatewayConfig.java similarity index 83% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java rename to intc-gateway/src/main/java/com/intc/gateway/config/GatewayConfig.java index 3bb6d8e..18e365a 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/GatewayConfig.java +++ b/intc-gateway/src/main/java/com/intc/gateway/config/GatewayConfig.java @@ -1,10 +1,10 @@ -package com.ruoyi.gateway.config; +package com.intc.gateway.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; -import com.ruoyi.gateway.handler.SentinelFallbackHandler; +import com.intc.gateway.handler.SentinelFallbackHandler; /** * 网关限流配置 diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java b/intc-gateway/src/main/java/com/intc/gateway/config/KaptchaTextCreator.java similarity index 98% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java rename to intc-gateway/src/main/java/com/intc/gateway/config/KaptchaTextCreator.java index f68e0fa..ffc7a4d 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java +++ b/intc-gateway/src/main/java/com/intc/gateway/config/KaptchaTextCreator.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.config; +package com.intc.gateway.config; import java.util.Random; import com.google.code.kaptcha.text.impl.DefaultTextCreator; diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java b/intc-gateway/src/main/java/com/intc/gateway/config/RouterFunctionConfiguration.java similarity index 91% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java rename to intc-gateway/src/main/java/com/intc/gateway/config/RouterFunctionConfiguration.java index db3c94e..22886ba 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/RouterFunctionConfiguration.java +++ b/intc-gateway/src/main/java/com/intc/gateway/config/RouterFunctionConfiguration.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.config; +package com.intc.gateway.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -7,7 +7,7 @@ import org.springframework.http.MediaType; import org.springframework.web.reactive.function.server.RequestPredicates; import org.springframework.web.reactive.function.server.RouterFunction; import org.springframework.web.reactive.function.server.RouterFunctions; -import com.ruoyi.gateway.handler.ValidateCodeHandler; +import com.intc.gateway.handler.ValidateCodeHandler; /** * 路由配置信息 diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SecurityConfig.java b/intc-gateway/src/main/java/com/intc/gateway/config/SecurityConfig.java similarity index 98% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SecurityConfig.java rename to intc-gateway/src/main/java/com/intc/gateway/config/SecurityConfig.java index 0574bed..af543dc 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SecurityConfig.java +++ b/intc-gateway/src/main/java/com/intc/gateway/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.config; +package com.intc.gateway.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java b/intc-gateway/src/main/java/com/intc/gateway/config/SwaggerProvider.java similarity index 94% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java rename to intc-gateway/src/main/java/com/intc/gateway/config/SwaggerProvider.java index ae22264..433f34d 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SwaggerProvider.java +++ b/intc-gateway/src/main/java/com/intc/gateway/config/SwaggerProvider.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.config; +package com.intc.gateway.config; import java.util.ArrayList; import java.util.List; @@ -53,7 +53,7 @@ public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigu .contains(routeDefinition.getId())) .forEach(routeDefinition -> routeDefinition.getPredicates().stream() .filter(predicateDefinition -> "Path".equalsIgnoreCase(predicateDefinition.getName())) - .filter(predicateDefinition -> !"ruoyi-auth".equalsIgnoreCase(routeDefinition.getId())) + .filter(predicateDefinition -> !"intc-auth".equalsIgnoreCase(routeDefinition.getId())) .forEach(predicateDefinition -> resourceList .add(swaggerResource(routeDefinition.getId(), predicateDefinition.getArgs() .get(NameUtils.GENERATED_NAME_PREFIX + "0").replace("/**", SWAGGER2URL))))); diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java b/intc-gateway/src/main/java/com/intc/gateway/config/properties/CaptchaProperties.java similarity index 94% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java rename to intc-gateway/src/main/java/com/intc/gateway/config/properties/CaptchaProperties.java index f6bb000..4f8d605 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/CaptchaProperties.java +++ b/intc-gateway/src/main/java/com/intc/gateway/config/properties/CaptchaProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.config.properties; +package com.intc.gateway.config.properties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java b/intc-gateway/src/main/java/com/intc/gateway/config/properties/IgnoreWhiteProperties.java similarity index 94% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java rename to intc-gateway/src/main/java/com/intc/gateway/config/properties/IgnoreWhiteProperties.java index 1d2c56a..3d55416 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java +++ b/intc-gateway/src/main/java/com/intc/gateway/config/properties/IgnoreWhiteProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.config.properties; +package com.intc.gateway.config.properties; import java.util.ArrayList; import java.util.List; diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java b/intc-gateway/src/main/java/com/intc/gateway/config/properties/XssProperties.java similarity index 95% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java rename to intc-gateway/src/main/java/com/intc/gateway/config/properties/XssProperties.java index 891679e..c1f6f6e 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/XssProperties.java +++ b/intc-gateway/src/main/java/com/intc/gateway/config/properties/XssProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.config.properties; +package com.intc.gateway.config.properties; import java.util.ArrayList; import java.util.List; diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java b/intc-gateway/src/main/java/com/intc/gateway/filter/AuthFilter.java similarity index 89% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java rename to intc-gateway/src/main/java/com/intc/gateway/filter/AuthFilter.java index 101de63..f730fcf 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/AuthFilter.java +++ b/intc-gateway/src/main/java/com/intc/gateway/filter/AuthFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.filter; +package com.intc.gateway.filter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -9,15 +9,15 @@ import org.springframework.core.Ordered; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; -import com.ruoyi.common.core.constant.CacheConstants; -import com.ruoyi.common.core.constant.HttpStatus; -import com.ruoyi.common.core.constant.SecurityConstants; -import com.ruoyi.common.core.constant.TokenConstants; -import com.ruoyi.common.core.utils.JwtUtils; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.redis.service.RedisService; -import com.ruoyi.gateway.config.properties.IgnoreWhiteProperties; +import com.intc.common.core.constant.CacheConstants; +import com.intc.common.core.constant.HttpStatus; +import com.intc.common.core.constant.SecurityConstants; +import com.intc.common.core.constant.TokenConstants; +import com.intc.common.core.utils.JwtUtils; +import com.intc.common.core.utils.ServletUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.redis.service.RedisService; +import com.intc.gateway.config.properties.IgnoreWhiteProperties; import io.jsonwebtoken.Claims; import reactor.core.publisher.Mono; diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java b/intc-gateway/src/main/java/com/intc/gateway/filter/BlackListUrlFilter.java similarity index 95% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java rename to intc-gateway/src/main/java/com/intc/gateway/filter/BlackListUrlFilter.java index 343bd01..8fa6b45 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/BlackListUrlFilter.java +++ b/intc-gateway/src/main/java/com/intc/gateway/filter/BlackListUrlFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.filter; +package com.intc.gateway.filter; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import java.util.regex.Pattern; import org.springframework.cloud.gateway.filter.GatewayFilter; import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.utils.ServletUtils; +import com.intc.common.core.utils.ServletUtils; /** * 黑名单过滤器 diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java b/intc-gateway/src/main/java/com/intc/gateway/filter/CacheRequestFilter.java similarity index 98% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java rename to intc-gateway/src/main/java/com/intc/gateway/filter/CacheRequestFilter.java index 94c6cb5..bb68071 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/CacheRequestFilter.java +++ b/intc-gateway/src/main/java/com/intc/gateway/filter/CacheRequestFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.filter; +package com.intc.gateway.filter; import java.util.Collections; import java.util.List; diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java b/intc-gateway/src/main/java/com/intc/gateway/filter/ValidateCodeFilter.java similarity index 91% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java rename to intc-gateway/src/main/java/com/intc/gateway/filter/ValidateCodeFilter.java index d5b75fd..9a5017c 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java +++ b/intc-gateway/src/main/java/com/intc/gateway/filter/ValidateCodeFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.filter; +package com.intc.gateway.filter; import java.nio.CharBuffer; import java.nio.charset.StandardCharsets; @@ -12,10 +12,10 @@ import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.stereotype.Component; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.gateway.config.properties.CaptchaProperties; -import com.ruoyi.gateway.service.ValidateCodeService; +import com.intc.common.core.utils.ServletUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.gateway.config.properties.CaptchaProperties; +import com.intc.gateway.service.ValidateCodeService; import reactor.core.publisher.Flux; /** diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java b/intc-gateway/src/main/java/com/intc/gateway/filter/XssFilter.java similarity index 96% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java rename to intc-gateway/src/main/java/com/intc/gateway/filter/XssFilter.java index 6fe6285..85c43ad 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/XssFilter.java +++ b/intc-gateway/src/main/java/com/intc/gateway/filter/XssFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.filter; +package com.intc.gateway.filter; import java.nio.charset.StandardCharsets; import org.springframework.beans.factory.annotation.Autowired; @@ -18,9 +18,9 @@ import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.http.server.reactive.ServerHttpRequestDecorator; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.html.EscapeUtil; -import com.ruoyi.gateway.config.properties.XssProperties; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.html.EscapeUtil; +import com.intc.gateway.config.properties.XssProperties; import io.netty.buffer.ByteBufAllocator; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java b/intc-gateway/src/main/java/com/intc/gateway/handler/GatewayExceptionHandler.java similarity index 95% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java rename to intc-gateway/src/main/java/com/intc/gateway/handler/GatewayExceptionHandler.java index 29ea5e3..f5e7dc9 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java +++ b/intc-gateway/src/main/java/com/intc/gateway/handler/GatewayExceptionHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.handler; +package com.intc.gateway.handler; import org.springframework.cloud.gateway.support.NotFoundException; import org.slf4j.Logger; @@ -9,7 +9,7 @@ import org.springframework.core.annotation.Order; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.web.server.ResponseStatusException; import org.springframework.web.server.ServerWebExchange; -import com.ruoyi.common.core.utils.ServletUtils; +import com.intc.common.core.utils.ServletUtils; import reactor.core.publisher.Mono; /** diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java b/intc-gateway/src/main/java/com/intc/gateway/handler/SentinelFallbackHandler.java similarity index 94% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java rename to intc-gateway/src/main/java/com/intc/gateway/handler/SentinelFallbackHandler.java index 86abf88..c7a807a 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SentinelFallbackHandler.java +++ b/intc-gateway/src/main/java/com/intc/gateway/handler/SentinelFallbackHandler.java @@ -1,8 +1,8 @@ -package com.ruoyi.gateway.handler; +package com.intc.gateway.handler; import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.GatewayCallbackManager; import com.alibaba.csp.sentinel.slots.block.BlockException; -import com.ruoyi.common.core.utils.ServletUtils; +import com.intc.common.core.utils.ServletUtils; import org.springframework.web.reactive.function.server.ServerResponse; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebExceptionHandler; diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SwaggerHandler.java b/intc-gateway/src/main/java/com/intc/gateway/handler/SwaggerHandler.java similarity index 98% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SwaggerHandler.java rename to intc-gateway/src/main/java/com/intc/gateway/handler/SwaggerHandler.java index daa21af..de1d326 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/SwaggerHandler.java +++ b/intc-gateway/src/main/java/com/intc/gateway/handler/SwaggerHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.handler; +package com.intc.gateway.handler; import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java b/intc-gateway/src/main/java/com/intc/gateway/handler/ValidateCodeHandler.java similarity index 84% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java rename to intc-gateway/src/main/java/com/intc/gateway/handler/ValidateCodeHandler.java index 45e7b15..af3410d 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/ValidateCodeHandler.java +++ b/intc-gateway/src/main/java/com/intc/gateway/handler/ValidateCodeHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.handler; +package com.intc.gateway.handler; import java.io.IOException; import org.springframework.beans.factory.annotation.Autowired; @@ -8,9 +8,9 @@ import org.springframework.web.reactive.function.BodyInserters; import org.springframework.web.reactive.function.server.HandlerFunction; import org.springframework.web.reactive.function.server.ServerRequest; import org.springframework.web.reactive.function.server.ServerResponse; -import com.ruoyi.common.core.exception.CaptchaException; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.gateway.service.ValidateCodeService; +import com.intc.common.core.exception.CaptchaException; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.gateway.service.ValidateCodeService; import reactor.core.publisher.Mono; /** diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java b/intc-gateway/src/main/java/com/intc/gateway/service/ValidateCodeService.java similarity index 71% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java rename to intc-gateway/src/main/java/com/intc/gateway/service/ValidateCodeService.java index 8a74aeb..3c95c14 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/ValidateCodeService.java +++ b/intc-gateway/src/main/java/com/intc/gateway/service/ValidateCodeService.java @@ -1,8 +1,8 @@ -package com.ruoyi.gateway.service; +package com.intc.gateway.service; import java.io.IOException; -import com.ruoyi.common.core.exception.CaptchaException; -import com.ruoyi.common.core.web.domain.AjaxResult; +import com.intc.common.core.exception.CaptchaException; +import com.intc.common.core.web.domain.AjaxResult; /** * 验证码处理 diff --git a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java b/intc-gateway/src/main/java/com/intc/gateway/service/impl/ValidateCodeServiceImpl.java similarity index 84% rename from ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java rename to intc-gateway/src/main/java/com/intc/gateway/service/impl/ValidateCodeServiceImpl.java index 2ae87bd..e4d84c4 100644 --- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java +++ b/intc-gateway/src/main/java/com/intc/gateway/service/impl/ValidateCodeServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.gateway.service.impl; +package com.intc.gateway.service.impl; import java.awt.image.BufferedImage; import java.io.IOException; @@ -9,16 +9,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.FastByteArrayOutputStream; import com.google.code.kaptcha.Producer; -import com.ruoyi.common.core.constant.CacheConstants; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.exception.CaptchaException; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.sign.Base64; -import com.ruoyi.common.core.utils.uuid.IdUtils; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.redis.service.RedisService; -import com.ruoyi.gateway.config.properties.CaptchaProperties; -import com.ruoyi.gateway.service.ValidateCodeService; +import com.intc.common.core.constant.CacheConstants; +import com.intc.common.core.constant.Constants; +import com.intc.common.core.exception.CaptchaException; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.sign.Base64; +import com.intc.common.core.utils.uuid.IdUtils; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.redis.service.RedisService; +import com.intc.gateway.config.properties.CaptchaProperties; +import com.intc.gateway.service.ValidateCodeService; /** * 验证码实现处理 diff --git a/ruoyi-gateway/src/main/resources/banner.txt b/intc-gateway/src/main/resources/banner.txt similarity index 100% rename from ruoyi-gateway/src/main/resources/banner.txt rename to intc-gateway/src/main/resources/banner.txt diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/intc-gateway/src/main/resources/bootstrap.yml similarity index 85% rename from ruoyi-gateway/src/main/resources/bootstrap.yml rename to intc-gateway/src/main/resources/bootstrap.yml index f93e242..b17ee6e 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/intc-gateway/src/main/resources/bootstrap.yml @@ -5,20 +5,20 @@ server: spring: application: # 应用名称 - name: ruoyi-gateway + name: intc-gateway profiles: # 环境配置 active: dev cloud: nacos: discovery: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 服务注册地址 server-addr: 101.126.95.100:8858 group: intc ip: 154.8.147.51 config: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 配置中心地址 server-addr: 101.126.95.100:8858 # 配置文件格式 @@ -37,7 +37,7 @@ spring: ds1: nacos: server-addr: 101.126.95.100:8858 - dataId: sentinel-ruoyi-gateway + dataId: sentinel-intc-gateway groupId: DEFAULT_GROUP data-type: json rule-type: gw-flow diff --git a/intc-gateway/src/main/resources/logback.xml b/intc-gateway/src/main/resources/logback.xml new file mode 100644 index 0000000..8ff1aba --- /dev/null +++ b/intc-gateway/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/intc-modules/intc-file/pom.xml similarity index 88% rename from ruoyi-modules/ruoyi-file/pom.xml rename to intc-modules/intc-file/pom.xml index 424254f..13cf368 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/intc-modules/intc-file/pom.xml @@ -3,16 +3,16 @@ 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"> - com.ruoyi - ruoyi-modules + com.intc + intc-modules 3.6.3 4.0.0 - ruoyi-modules-file + intc-modules-file - ruoyi-modules-file文件服务 + intc-modules-file文件服务 @@ -63,14 +63,14 @@ - com.ruoyi - ruoyi-api-system + com.intc + intc-api-system - com.ruoyi - ruoyi-common-swagger + com.intc + intc-common-swagger diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java b/intc-modules/intc-file/src/main/java/com/intc/file/IntcFileApplication.java similarity index 84% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java rename to intc-modules/intc-file/src/main/java/com/intc/file/IntcFileApplication.java index 1f320da..ffceb4a 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java +++ b/intc-modules/intc-file/src/main/java/com/intc/file/IntcFileApplication.java @@ -1,9 +1,9 @@ -package com.ruoyi.file; +package com.intc.file; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; +import com.intc.common.swagger.annotation.EnableCustomSwagger2; /** * 文件服务 @@ -12,11 +12,11 @@ import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; */ @EnableCustomSwagger2 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) -public class RuoYiFileApplication +public class IntcFileApplication { public static void main(String[] args) { - SpringApplication.run(RuoYiFileApplication.class, args); + SpringApplication.run(IntcFileApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 文件服务模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ActuatorSecurityConfig.java b/intc-modules/intc-file/src/main/java/com/intc/file/config/ActuatorSecurityConfig.java similarity index 94% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ActuatorSecurityConfig.java rename to intc-modules/intc-file/src/main/java/com/intc/file/config/ActuatorSecurityConfig.java index 5d499bd..91f8567 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ActuatorSecurityConfig.java +++ b/intc-modules/intc-file/src/main/java/com/intc/file/config/ActuatorSecurityConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.job.config; +package com.intc.file.config; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java b/intc-modules/intc-file/src/main/java/com/intc/file/config/MinioConfig.java similarity index 97% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java rename to intc-modules/intc-file/src/main/java/com/intc/file/config/MinioConfig.java index 29beea0..494b379 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/MinioConfig.java +++ b/intc-modules/intc-file/src/main/java/com/intc/file/config/MinioConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.file.config; +package com.intc.file.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java b/intc-modules/intc-file/src/main/java/com/intc/file/config/ResourcesConfig.java similarity index 97% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java rename to intc-modules/intc-file/src/main/java/com/intc/file/config/ResourcesConfig.java index 8003670..0c3c86d 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ResourcesConfig.java +++ b/intc-modules/intc-file/src/main/java/com/intc/file/config/ResourcesConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.file.config; +package com.intc.file.config; import java.io.File; import org.springframework.beans.factory.annotation.Value; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java b/intc-modules/intc-file/src/main/java/com/intc/file/controller/SysFileController.java similarity index 87% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java rename to intc-modules/intc-file/src/main/java/com/intc/file/controller/SysFileController.java index c71cf43..6288489 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java +++ b/intc-modules/intc-file/src/main/java/com/intc/file/controller/SysFileController.java @@ -1,4 +1,4 @@ -package com.ruoyi.file.controller; +package com.intc.file.controller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -7,10 +7,10 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.file.FileUtils; -import com.ruoyi.file.service.ISysFileService; -import com.ruoyi.system.api.domain.SysFile; +import com.intc.common.core.domain.R; +import com.intc.common.core.utils.file.FileUtils; +import com.intc.file.service.ISysFileService; +import com.intc.system.api.domain.SysFile; import javax.servlet.http.HttpServletResponse; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java b/intc-modules/intc-file/src/main/java/com/intc/file/service/FastDfsSysFileServiceImpl.java similarity index 93% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java rename to intc-modules/intc-file/src/main/java/com/intc/file/service/FastDfsSysFileServiceImpl.java index 783a73d..eef8fed 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java +++ b/intc-modules/intc-file/src/main/java/com/intc/file/service/FastDfsSysFileServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.file.service; +package com.intc.file.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -6,7 +6,7 @@ import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import com.github.tobato.fastdfs.domain.fdfs.StorePath; import com.github.tobato.fastdfs.service.FastFileStorageClient; -import com.ruoyi.common.core.utils.file.FileTypeUtils; +import com.intc.common.core.utils.file.FileTypeUtils; import javax.servlet.http.HttpServletResponse; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java b/intc-modules/intc-file/src/main/java/com/intc/file/service/ISysFileService.java similarity index 94% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java rename to intc-modules/intc-file/src/main/java/com/intc/file/service/ISysFileService.java index 2f89ca9..07a50ec 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/ISysFileService.java +++ b/intc-modules/intc-file/src/main/java/com/intc/file/service/ISysFileService.java @@ -1,4 +1,4 @@ -package com.ruoyi.file.service; +package com.intc.file.service; import org.springframework.web.multipart.MultipartFile; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java b/intc-modules/intc-file/src/main/java/com/intc/file/service/LocalSysFileServiceImpl.java similarity index 94% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java rename to intc-modules/intc-file/src/main/java/com/intc/file/service/LocalSysFileServiceImpl.java index 9a6b4ed..7b02a50 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java +++ b/intc-modules/intc-file/src/main/java/com/intc/file/service/LocalSysFileServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.file.service; +package com.intc.file.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.file.utils.FileUploadUtils; +import com.intc.file.utils.FileUploadUtils; import javax.servlet.http.HttpServletResponse; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java b/intc-modules/intc-file/src/main/java/com/intc/file/service/MinioSysFileServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java rename to intc-modules/intc-file/src/main/java/com/intc/file/service/MinioSysFileServiceImpl.java index ab52a2b..e0b8bf1 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java +++ b/intc-modules/intc-file/src/main/java/com/intc/file/service/MinioSysFileServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.file.service; +package com.intc.file.service; import io.minio.*; import org.springframework.beans.factory.annotation.Value; @@ -6,8 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.file.config.MinioConfig; -import com.ruoyi.file.utils.FileUploadUtils; +import com.intc.file.config.MinioConfig; +import com.intc.file.utils.FileUploadUtils; import javax.servlet.http.HttpServletResponse; import java.io.InputStream; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java b/intc-modules/intc-file/src/main/java/com/intc/file/utils/FileUploadUtils.java similarity index 91% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java rename to intc-modules/intc-file/src/main/java/com/intc/file/utils/FileUploadUtils.java index e27bcd4..24b37e1 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java +++ b/intc-modules/intc-file/src/main/java/com/intc/file/utils/FileUploadUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.file.utils; +package com.intc.file.utils; import java.io.File; import java.io.IOException; @@ -6,14 +6,14 @@ import java.nio.file.Paths; import java.util.Objects; import org.apache.commons.io.FilenameUtils; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.exception.file.FileNameLengthLimitExceededException; -import com.ruoyi.common.core.exception.file.FileSizeLimitExceededException; -import com.ruoyi.common.core.exception.file.InvalidExtensionException; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.file.FileTypeUtils; -import com.ruoyi.common.core.utils.file.MimeTypeUtils; -import com.ruoyi.common.core.utils.uuid.Seq; +import com.intc.common.core.exception.file.FileNameLengthLimitExceededException; +import com.intc.common.core.exception.file.FileSizeLimitExceededException; +import com.intc.common.core.exception.file.InvalidExtensionException; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.file.FileTypeUtils; +import com.intc.common.core.utils.file.MimeTypeUtils; +import com.intc.common.core.utils.uuid.Seq; /** * 文件上传工具类 diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/banner.txt b/intc-modules/intc-file/src/main/resources/banner.txt similarity index 100% rename from ruoyi-modules/ruoyi-file/src/main/resources/banner.txt rename to intc-modules/intc-file/src/main/resources/banner.txt diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/intc-modules/intc-file/src/main/resources/bootstrap.yml similarity index 87% rename from ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml rename to intc-modules/intc-file/src/main/resources/bootstrap.yml index 44880c6..16abd72 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/intc-modules/intc-file/src/main/resources/bootstrap.yml @@ -9,7 +9,7 @@ server: spring: application: # 应用名称 - name: ruoyi-file + name: intc-file profiles: # 环境配置 active: dev @@ -21,13 +21,13 @@ spring: cloud: nacos: discovery: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 服务注册地址 server-addr: 101.126.95.100:8858 group: intc ip: 101.126.95.100 config: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 配置中心地址 server-addr: 101.126.95.100:8858 # 配置文件格式 diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml b/intc-modules/intc-file/src/main/resources/logback.xml similarity index 96% rename from ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml rename to intc-modules/intc-file/src/main/resources/logback.xml index 2b2504d..6c45041 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/logback.xml +++ b/intc-modules/intc-file/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/intc-modules/intc-gen/pom.xml similarity index 87% rename from ruoyi-modules/ruoyi-gen/pom.xml rename to intc-modules/intc-gen/pom.xml index 40203a9..e1476a0 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/intc-modules/intc-gen/pom.xml @@ -3,16 +3,16 @@ 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"> - com.ruoyi - ruoyi-modules + com.intc + intc-modules 3.6.3 4.0.0 - ruoyi-modules-gen + intc-modules-gen - ruoyi-modules-gen代码生成 + intc-modules-gen代码生成 @@ -56,15 +56,15 @@ - com.ruoyi - ruoyi-common-log + com.intc + intc-common-log 3.6.3 - com.ruoyi - ruoyi-common-swagger + com.intc + intc-common-swagger 3.6.3 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java b/intc-modules/intc-gen/src/main/java/com/intc/gen/IntcGenApplication.java similarity index 75% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java rename to intc-modules/intc-gen/src/main/java/com/intc/gen/IntcGenApplication.java index f896ec3..ee91c17 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/RuoYiGenApplication.java +++ b/intc-modules/intc-gen/src/main/java/com/intc/gen/IntcGenApplication.java @@ -1,10 +1,10 @@ -package com.ruoyi.gen; +package com.intc.gen; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import com.ruoyi.common.security.annotation.EnableCustomConfig; -import com.ruoyi.common.security.annotation.EnableRyFeignClients; -import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; +import com.intc.common.security.annotation.EnableCustomConfig; +import com.intc.common.security.annotation.EnableRyFeignClients; +import com.intc.common.swagger.annotation.EnableCustomSwagger2; /** * 代码生成 @@ -15,11 +15,11 @@ import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; @EnableCustomSwagger2 @EnableRyFeignClients @SpringBootApplication -public class RuoYiGenApplication +public class IntcGenApplication { public static void main(String[] args) { - SpringApplication.run(RuoYiGenApplication.class, args); + SpringApplication.run(IntcGenApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 代码生成模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java b/intc-modules/intc-gen/src/main/java/com/intc/gen/config/GenConfig.java similarity index 97% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java rename to intc-modules/intc-gen/src/main/java/com/intc/gen/config/GenConfig.java index ee7161b..f73c0ab 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java +++ b/intc-modules/intc-gen/src/main/java/com/intc/gen/config/GenConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.gen.config; +package com.intc.gen.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java b/intc-modules/intc-gen/src/main/java/com/intc/gen/controller/GenController.java similarity index 91% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java rename to intc-modules/intc-gen/src/main/java/com/intc/gen/controller/GenController.java index 72f8489..f5ef508 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java +++ b/intc-modules/intc-gen/src/main/java/com/intc/gen/controller/GenController.java @@ -1,4 +1,4 @@ -package com.ruoyi.gen.controller; +package com.intc.gen.controller; import java.io.IOException; import java.util.HashMap; @@ -16,17 +16,17 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.gen.domain.GenTable; -import com.ruoyi.gen.domain.GenTableColumn; -import com.ruoyi.gen.service.IGenTableColumnService; -import com.ruoyi.gen.service.IGenTableService; +import com.intc.common.core.text.Convert; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.gen.domain.GenTable; +import com.intc.gen.domain.GenTableColumn; +import com.intc.gen.service.IGenTableColumnService; +import com.intc.gen.service.IGenTableService; /** * 代码生成 操作处理 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java b/intc-modules/intc-gen/src/main/java/com/intc/gen/domain/GenTable.java similarity index 97% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java rename to intc-modules/intc-gen/src/main/java/com/intc/gen/domain/GenTable.java index dac28dc..2c56c83 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java +++ b/intc-modules/intc-gen/src/main/java/com/intc/gen/domain/GenTable.java @@ -1,12 +1,12 @@ -package com.ruoyi.gen.domain; +package com.intc.gen.domain; import java.util.List; import javax.validation.Valid; import javax.validation.constraints.NotBlank; import org.apache.commons.lang3.ArrayUtils; -import com.ruoyi.common.core.constant.GenConstants; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.constant.GenConstants; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.web.domain.BaseEntity; /** * 业务表 gen_table diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java b/intc-modules/intc-gen/src/main/java/com/intc/gen/domain/GenTableColumn.java similarity index 98% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java rename to intc-modules/intc-gen/src/main/java/com/intc/gen/domain/GenTableColumn.java index 21663f8..6ded094 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java +++ b/intc-modules/intc-gen/src/main/java/com/intc/gen/domain/GenTableColumn.java @@ -1,9 +1,9 @@ -package com.ruoyi.gen.domain; +package com.intc.gen.domain; import javax.validation.constraints.NotBlank; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.web.domain.BaseEntity; /** * 代码生成业务字段表 gen_table_column diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java b/intc-modules/intc-gen/src/main/java/com/intc/gen/mapper/GenTableColumnMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java rename to intc-modules/intc-gen/src/main/java/com/intc/gen/mapper/GenTableColumnMapper.java index 0be7cc0..8938088 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableColumnMapper.java +++ b/intc-modules/intc-gen/src/main/java/com/intc/gen/mapper/GenTableColumnMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.gen.mapper; +package com.intc.gen.mapper; import java.util.List; -import com.ruoyi.gen.domain.GenTableColumn; +import com.intc.gen.domain.GenTableColumn; /** * 业务字段 数据层 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java b/intc-modules/intc-gen/src/main/java/com/intc/gen/mapper/GenTableMapper.java similarity index 95% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java rename to intc-modules/intc-gen/src/main/java/com/intc/gen/mapper/GenTableMapper.java index 3487d6a..b003a0a 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/mapper/GenTableMapper.java +++ b/intc-modules/intc-gen/src/main/java/com/intc/gen/mapper/GenTableMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.gen.mapper; +package com.intc.gen.mapper; import java.util.List; -import com.ruoyi.gen.domain.GenTable; +import com.intc.gen.domain.GenTable; /** * 业务 数据层 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java b/intc-modules/intc-gen/src/main/java/com/intc/gen/service/GenTableColumnServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java rename to intc-modules/intc-gen/src/main/java/com/intc/gen/service/GenTableColumnServiceImpl.java index f009c4b..487dd15 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableColumnServiceImpl.java +++ b/intc-modules/intc-gen/src/main/java/com/intc/gen/service/GenTableColumnServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.gen.service; +package com.intc.gen.service; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.gen.domain.GenTableColumn; -import com.ruoyi.gen.mapper.GenTableColumnMapper; +import com.intc.common.core.text.Convert; +import com.intc.gen.domain.GenTableColumn; +import com.intc.gen.mapper.GenTableColumnMapper; /** * 业务字段 服务层实现 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java b/intc-modules/intc-gen/src/main/java/com/intc/gen/service/GenTableServiceImpl.java similarity index 96% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java rename to intc-modules/intc-gen/src/main/java/com/intc/gen/service/GenTableServiceImpl.java index 11e2a23..d8aca51 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java +++ b/intc-modules/intc-gen/src/main/java/com/intc/gen/service/GenTableServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.gen.service; +package com.intc.gen.service; import java.io.ByteArrayOutputStream; import java.io.File; @@ -23,19 +23,19 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.constant.GenConstants; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.text.CharsetKit; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.gen.domain.GenTable; -import com.ruoyi.gen.domain.GenTableColumn; -import com.ruoyi.gen.mapper.GenTableColumnMapper; -import com.ruoyi.gen.mapper.GenTableMapper; -import com.ruoyi.gen.util.GenUtils; -import com.ruoyi.gen.util.VelocityInitializer; -import com.ruoyi.gen.util.VelocityUtils; +import com.intc.common.core.constant.Constants; +import com.intc.common.core.constant.GenConstants; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.text.CharsetKit; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.gen.domain.GenTable; +import com.intc.gen.domain.GenTableColumn; +import com.intc.gen.mapper.GenTableColumnMapper; +import com.intc.gen.mapper.GenTableMapper; +import com.intc.gen.util.GenUtils; +import com.intc.gen.util.VelocityInitializer; +import com.intc.gen.util.VelocityUtils; /** * 业务 服务层实现 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java b/intc-modules/intc-gen/src/main/java/com/intc/gen/service/IGenTableColumnService.java similarity index 92% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java rename to intc-modules/intc-gen/src/main/java/com/intc/gen/service/IGenTableColumnService.java index 1f23685..eccdbe7 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableColumnService.java +++ b/intc-modules/intc-gen/src/main/java/com/intc/gen/service/IGenTableColumnService.java @@ -1,7 +1,7 @@ -package com.ruoyi.gen.service; +package com.intc.gen.service; import java.util.List; -import com.ruoyi.gen.domain.GenTableColumn; +import com.intc.gen.domain.GenTableColumn; /** * 业务字段 服务层 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java b/intc-modules/intc-gen/src/main/java/com/intc/gen/service/IGenTableService.java similarity index 97% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java rename to intc-modules/intc-gen/src/main/java/com/intc/gen/service/IGenTableService.java index 0da8af7..045f5c6 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java +++ b/intc-modules/intc-gen/src/main/java/com/intc/gen/service/IGenTableService.java @@ -1,8 +1,8 @@ -package com.ruoyi.gen.service; +package com.intc.gen.service; import java.util.List; import java.util.Map; -import com.ruoyi.gen.domain.GenTable; +import com.intc.gen.domain.GenTable; /** * 业务 服务层 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java b/intc-modules/intc-gen/src/main/java/com/intc/gen/util/GenUtils.java similarity index 96% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java rename to intc-modules/intc-gen/src/main/java/com/intc/gen/util/GenUtils.java index 3dae786..098c97f 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/GenUtils.java +++ b/intc-modules/intc-gen/src/main/java/com/intc/gen/util/GenUtils.java @@ -1,12 +1,12 @@ -package com.ruoyi.gen.util; +package com.intc.gen.util; import java.util.Arrays; import org.apache.commons.lang3.RegExUtils; -import com.ruoyi.common.core.constant.GenConstants; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.gen.config.GenConfig; -import com.ruoyi.gen.domain.GenTable; -import com.ruoyi.gen.domain.GenTableColumn; +import com.intc.common.core.constant.GenConstants; +import com.intc.common.core.utils.StringUtils; +import com.intc.gen.config.GenConfig; +import com.intc.gen.domain.GenTable; +import com.intc.gen.domain.GenTableColumn; /** * 代码生成器 工具类 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java b/intc-modules/intc-gen/src/main/java/com/intc/gen/util/VelocityInitializer.java similarity index 91% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java rename to intc-modules/intc-gen/src/main/java/com/intc/gen/util/VelocityInitializer.java index d6f0160..a2f570d 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityInitializer.java +++ b/intc-modules/intc-gen/src/main/java/com/intc/gen/util/VelocityInitializer.java @@ -1,8 +1,8 @@ -package com.ruoyi.gen.util; +package com.intc.gen.util; import java.util.Properties; import org.apache.velocity.app.Velocity; -import com.ruoyi.common.core.constant.Constants; +import com.intc.common.core.constant.Constants; /** * VelocityEngine工厂 diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java b/intc-modules/intc-gen/src/main/java/com/intc/gen/util/VelocityUtils.java similarity index 98% rename from ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java rename to intc-modules/intc-gen/src/main/java/com/intc/gen/util/VelocityUtils.java index dff0b56..e513043 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java +++ b/intc-modules/intc-gen/src/main/java/com/intc/gen/util/VelocityUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.gen.util; +package com.intc.gen.util; import java.util.ArrayList; import java.util.HashSet; @@ -7,11 +7,11 @@ import java.util.Set; import org.apache.velocity.VelocityContext; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.core.constant.GenConstants; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.gen.domain.GenTable; -import com.ruoyi.gen.domain.GenTableColumn; +import com.intc.common.core.constant.GenConstants; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.gen.domain.GenTable; +import com.intc.gen.domain.GenTableColumn; /** * 模板工具类 diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/banner.txt b/intc-modules/intc-gen/src/main/resources/banner.txt similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/banner.txt rename to intc-modules/intc-gen/src/main/resources/banner.txt diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/intc-modules/intc-gen/src/main/resources/bootstrap.yml similarity index 81% rename from ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml rename to intc-modules/intc-gen/src/main/resources/bootstrap.yml index efa9cdc..797fbf6 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/intc-modules/intc-gen/src/main/resources/bootstrap.yml @@ -6,20 +6,20 @@ server: spring: application: # 应用名称 - name: ruoyi-gen + name: intc-gen profiles: # 环境配置 active: dev cloud: nacos: discovery: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 服务注册地址 server-addr: 101.126.95.100:8858 group: intc ip: 8.140.22.151 config: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 配置中心地址 server-addr: 101.126.95.100:8858 # 配置文件格式 diff --git a/ruoyi-auth/src/main/resources/logback.xml b/intc-modules/intc-gen/src/main/resources/logback.xml similarity index 96% rename from ruoyi-auth/src/main/resources/logback.xml rename to intc-modules/intc-gen/src/main/resources/logback.xml index 1c36583..2404816 100644 --- a/ruoyi-auth/src/main/resources/logback.xml +++ b/intc-modules/intc-gen/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/intc-modules/intc-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to intc-modules/intc-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml index 649f423..1760588 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/intc-modules/intc-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml b/intc-modules/intc-gen/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml rename to intc-modules/intc-gen/src/main/resources/mapper/generator/GenTableMapper.xml index e5f4d1d..000d60c 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/intc-modules/intc-gen/src/main/resources/mapper/generator/GenTableMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm b/intc-modules/intc-gen/src/main/resources/vm/java/controller.java.vm similarity index 92% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm rename to intc-modules/intc-gen/src/main/resources/vm/java/controller.java.vm index 007ebd5..710aadc 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm +++ b/intc-modules/intc-gen/src/main/resources/vm/java/controller.java.vm @@ -12,20 +12,20 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; import ${packageName}.domain.${ClassName}; import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.dto.${ClassName}Dto; import ${packageName}.service.I${ClassName}Service; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; #if($table.crud || $table.sub) -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; #elseif($table.tree) #end diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm b/intc-modules/intc-gen/src/main/resources/vm/java/domain.java.vm similarity index 93% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm rename to intc-modules/intc-gen/src/main/resources/vm/java/domain.java.vm index 6b52fac..9141166 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm +++ b/intc-modules/intc-gen/src/main/resources/vm/java/domain.java.vm @@ -5,11 +5,11 @@ import ${import}; #end import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.annotation.Excel; +import com.intc.common.core.annotation.Excel; #if($table.crud || $table.sub) -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; #elseif($table.tree) -import com.ruoyi.common.core.web.domain.TreeEntity; +import com.intc.common.core.web.domain.TreeEntity; #end import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domainDto.java.vm b/intc-modules/intc-gen/src/main/resources/vm/java/domainDto.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domainDto.java.vm rename to intc-modules/intc-gen/src/main/resources/vm/java/domainDto.java.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domainVo.java.vm b/intc-modules/intc-gen/src/main/resources/vm/java/domainVo.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domainVo.java.vm rename to intc-modules/intc-gen/src/main/resources/vm/java/domainVo.java.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm b/intc-modules/intc-gen/src/main/resources/vm/java/mapper.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm rename to intc-modules/intc-gen/src/main/resources/vm/java/mapper.java.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm b/intc-modules/intc-gen/src/main/resources/vm/java/service.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm rename to intc-modules/intc-gen/src/main/resources/vm/java/service.java.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm b/intc-modules/intc-gen/src/main/resources/vm/java/serviceImpl.java.vm similarity index 96% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm rename to intc-modules/intc-gen/src/main/resources/vm/java/serviceImpl.java.vm index 25932b9..55def42 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm +++ b/intc-modules/intc-gen/src/main/resources/vm/java/serviceImpl.java.vm @@ -3,17 +3,17 @@ package ${packageName}.service.impl; import java.util.List; #foreach ($column in $columns) #if($column.javaField == 'createTime' || $column.javaField == 'updateTime') -import com.ruoyi.common.core.utils.DateUtils; +import com.intc.common.core.utils.DateUtils; #break #end #end -import com.ruoyi.common.security.utils.SecurityUtils; +import com.intc.common.security.utils.SecurityUtils; import javax.annotation.Resource; import org.springframework.stereotype.Service; #if($table.sub) import java.util.ArrayList; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.utils.SecurityUtils; import org.springframework.transaction.annotation.Transactional; import ${packageName}.domain.${subClassName}; #end diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/sub-domain.java.vm b/intc-modules/intc-gen/src/main/resources/vm/java/sub-domain.java.vm similarity index 95% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/sub-domain.java.vm rename to intc-modules/intc-gen/src/main/resources/vm/java/sub-domain.java.vm index 2e039ff..9ed72e6 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/sub-domain.java.vm +++ b/intc-modules/intc-gen/src/main/resources/vm/java/sub-domain.java.vm @@ -5,8 +5,8 @@ import ${import}; #end 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.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; /** * ${subTable.functionName}对象 ${subTableName} diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/js/api.js.vm b/intc-modules/intc-gen/src/main/resources/vm/js/api.js.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/js/api.js.vm rename to intc-modules/intc-gen/src/main/resources/vm/js/api.js.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/sql.vm b/intc-modules/intc-gen/src/main/resources/vm/sql/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/sql.vm rename to intc-modules/intc-gen/src/main/resources/vm/sql/sql.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm b/intc-modules/intc-gen/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm rename to intc-modules/intc-gen/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm b/intc-modules/intc-gen/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm rename to intc-modules/intc-gen/src/main/resources/vm/vue/index.vue.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm b/intc-modules/intc-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm rename to intc-modules/intc-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm b/intc-modules/intc-gen/src/main/resources/vm/vue/v3/index.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm rename to intc-modules/intc-gen/src/main/resources/vm/vue/v3/index.vue.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/readme.txt b/intc-modules/intc-gen/src/main/resources/vm/vue/v3/readme.txt similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/readme.txt rename to intc-modules/intc-gen/src/main/resources/vm/vue/v3/readme.txt diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm b/intc-modules/intc-gen/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm rename to intc-modules/intc-gen/src/main/resources/vm/xml/mapper.xml.vm diff --git a/ruoyi-modules/intc-health/README.md b/intc-modules/intc-health/README.md similarity index 100% rename from ruoyi-modules/intc-health/README.md rename to intc-modules/intc-health/README.md diff --git a/ruoyi-modules/intc-health/pom.xml b/intc-modules/intc-health/pom.xml similarity index 89% rename from ruoyi-modules/intc-health/pom.xml rename to intc-modules/intc-health/pom.xml index eb5a3eb..47f349a 100644 --- a/ruoyi-modules/intc-health/pom.xml +++ b/intc-modules/intc-health/pom.xml @@ -3,8 +3,8 @@ 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"> - com.ruoyi - ruoyi-modules + com.intc + intc-modules 3.6.3 4.0.0 @@ -65,15 +65,15 @@ - com.ruoyi - ruoyi-common-datasource + com.intc + intc-common-datasource 3.6.3 - com.ruoyi - ruoyi-common-datascope + com.intc + intc-common-datascope 3.6.3 @@ -91,14 +91,14 @@ - com.ruoyi - ruoyi-common-log + com.intc + intc-common-log - com.ruoyi - ruoyi-common-swagger + com.intc + intc-common-swagger ws.schild diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/IntcHealthApplication.java b/intc-modules/intc-health/src/main/java/com/ruoyi/IntcHealthApplication.java similarity index 71% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/IntcHealthApplication.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/IntcHealthApplication.java index 624dc05..c9e8fdb 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/IntcHealthApplication.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/IntcHealthApplication.java @@ -1,10 +1,10 @@ -package com.ruoyi; +package com.intc; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import com.ruoyi.common.security.annotation.EnableCustomConfig; -import com.ruoyi.common.security.annotation.EnableRyFeignClients; -import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; +import com.intc.common.security.annotation.EnableCustomConfig; +import com.intc.common.security.annotation.EnableRyFeignClients; +import com.intc.common.swagger.annotation.EnableCustomSwagger2; /** * 系统模块 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/config/ActuatorSecurityConfig.java b/intc-modules/intc-health/src/main/java/com/ruoyi/config/ActuatorSecurityConfig.java similarity index 94% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/config/ActuatorSecurityConfig.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/config/ActuatorSecurityConfig.java index 05433e1..04d6411 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/config/ActuatorSecurityConfig.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/config/ActuatorSecurityConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.config; +package com.intc.config; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthActivityController.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthActivityController.java similarity index 85% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthActivityController.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthActivityController.java index 7bdf750..b8de412 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthActivityController.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthActivityController.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.controller; +package com.intc.health.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.health.domain.HealthActivity; -import com.ruoyi.health.domain.vo.HealthActivityVo; -import com.ruoyi.health.domain.dto.HealthActivityDto; -import com.ruoyi.health.service.IHealthActivityService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.health.domain.HealthActivity; +import com.intc.health.domain.vo.HealthActivityVo; +import com.intc.health.domain.dto.HealthActivityDto; +import com.intc.health.service.IHealthActivityService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 活动记录Controller diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthDiseasesController.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthDiseasesController.java similarity index 85% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthDiseasesController.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthDiseasesController.java index a791db2..eefd82b 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthDiseasesController.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthDiseasesController.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.controller; +package com.intc.health.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.health.domain.HealthDiseases; -import com.ruoyi.health.domain.vo.HealthDiseasesVo; -import com.ruoyi.health.domain.dto.HealthDiseasesDto; -import com.ruoyi.health.service.IHealthDiseasesService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.health.domain.HealthDiseases; +import com.intc.health.domain.vo.HealthDiseasesVo; +import com.intc.health.domain.dto.HealthDiseasesDto; +import com.intc.health.service.IHealthDiseasesService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 常见疾病治疗Controller diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthDoctorRecordController.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthDoctorRecordController.java similarity index 85% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthDoctorRecordController.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthDoctorRecordController.java index 8c5c905..55d063c 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthDoctorRecordController.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthDoctorRecordController.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.controller; +package com.intc.health.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.health.domain.HealthDoctorRecord; -import com.ruoyi.health.domain.vo.HealthDoctorRecordVo; -import com.ruoyi.health.domain.dto.HealthDoctorRecordDto; -import com.ruoyi.health.service.IHealthDoctorRecordService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.health.domain.HealthDoctorRecord; +import com.intc.health.domain.vo.HealthDoctorRecordVo; +import com.intc.health.domain.dto.HealthDoctorRecordDto; +import com.intc.health.service.IHealthDoctorRecordService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 就医记录Controller diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthDoctorRecordCostController.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthDoctorRecordCostController.java similarity index 84% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthDoctorRecordCostController.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthDoctorRecordCostController.java index 625cf3e..b466144 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthDoctorRecordCostController.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthDoctorRecordCostController.java @@ -1,16 +1,16 @@ -package com.ruoyi.health.controller; +package com.intc.health.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.health.domain.HealthDoctorRecordCost; -import com.ruoyi.health.domain.dto.HealthDoctorRecordCostDto; -import com.ruoyi.health.domain.vo.HealthDoctorRecordCostVo; -import com.ruoyi.health.service.IHealthDoctorRecordCostService; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.health.domain.HealthDoctorRecordCost; +import com.intc.health.domain.dto.HealthDoctorRecordCostDto; +import com.intc.health.domain.vo.HealthDoctorRecordCostVo; +import com.intc.health.service.IHealthDoctorRecordCostService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthHeightWeightRecordController.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthHeightWeightRecordController.java similarity index 86% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthHeightWeightRecordController.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthHeightWeightRecordController.java index 29f669c..1281654 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthHeightWeightRecordController.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthHeightWeightRecordController.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.controller; +package com.intc.health.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.health.domain.HealthHeightWeightRecord; -import com.ruoyi.health.domain.vo.HealthHeightWeightRecordVo; -import com.ruoyi.health.domain.dto.HealthHeightWeightRecordDto; -import com.ruoyi.health.service.IHealthHeightWeightRecordService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.health.domain.HealthHeightWeightRecord; +import com.intc.health.domain.vo.HealthHeightWeightRecordVo; +import com.intc.health.domain.dto.HealthHeightWeightRecordDto; +import com.intc.health.service.IHealthHeightWeightRecordService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 身高体重记录Controller diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMarRecordController.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMarRecordController.java similarity index 85% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMarRecordController.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMarRecordController.java index 58ab57b..bdb3547 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMarRecordController.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMarRecordController.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.controller; +package com.intc.health.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.health.domain.HealthMarRecord; -import com.ruoyi.health.domain.vo.HealthMarRecordVo; -import com.ruoyi.health.domain.dto.HealthMarRecordDto; -import com.ruoyi.health.service.IHealthMarRecordService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.health.domain.HealthMarRecord; +import com.intc.health.domain.vo.HealthMarRecordVo; +import com.intc.health.domain.dto.HealthMarRecordDto; +import com.intc.health.service.IHealthMarRecordService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 用药记录Controller diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineBasicController.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineBasicController.java similarity index 84% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineBasicController.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineBasicController.java index b22d5eb..45063bb 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineBasicController.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineBasicController.java @@ -1,16 +1,16 @@ -package com.ruoyi.health.controller; +package com.intc.health.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.health.domain.HealthMedicineBasic; -import com.ruoyi.health.domain.dto.HealthMedicineBasicDto; -import com.ruoyi.health.domain.vo.HealthMedicineBasicVo; -import com.ruoyi.health.service.IHealthMedicineBasicService; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.health.domain.HealthMedicineBasic; +import com.intc.health.domain.dto.HealthMedicineBasicDto; +import com.intc.health.domain.vo.HealthMedicineBasicVo; +import com.intc.health.service.IHealthMedicineBasicService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineRealtimeStockController.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineRealtimeStockController.java similarity index 86% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineRealtimeStockController.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineRealtimeStockController.java index a6b3541..d78f0d7 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineRealtimeStockController.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineRealtimeStockController.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.controller; +package com.intc.health.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.health.domain.HealthMedicineRealtimeStock; -import com.ruoyi.health.domain.vo.HealthMedicineRealtimeStockVo; -import com.ruoyi.health.domain.dto.HealthMedicineRealtimeStockDto; -import com.ruoyi.health.service.IHealthMedicineRealtimeStockService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.health.domain.HealthMedicineRealtimeStock; +import com.intc.health.domain.vo.HealthMedicineRealtimeStockVo; +import com.intc.health.domain.dto.HealthMedicineRealtimeStockDto; +import com.intc.health.service.IHealthMedicineRealtimeStockService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 药品实时库存Controller diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineStockInController.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineStockInController.java similarity index 86% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineStockInController.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineStockInController.java index d774daf..e168ea6 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineStockInController.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineStockInController.java @@ -1,16 +1,16 @@ -package com.ruoyi.health.controller; +package com.intc.health.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.health.domain.HealthMedicineStockIn; -import com.ruoyi.health.domain.dto.HealthMedicineStockInDto; -import com.ruoyi.health.domain.vo.HealthMedicineStockInVo; -import com.ruoyi.health.service.IHealthMedicineStockInService; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.health.domain.HealthMedicineStockIn; +import com.intc.health.domain.dto.HealthMedicineStockInDto; +import com.intc.health.domain.vo.HealthMedicineStockInVo; +import com.intc.health.service.IHealthMedicineStockInService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineTagsController.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineTagsController.java similarity index 85% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineTagsController.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineTagsController.java index 2b5b2f7..bbb250d 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineTagsController.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineTagsController.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.controller; +package com.intc.health.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.health.domain.HealthMedicineTags; -import com.ruoyi.health.domain.vo.HealthMedicineTagsVo; -import com.ruoyi.health.domain.dto.HealthMedicineTagsDto; -import com.ruoyi.health.service.IHealthMedicineTagsService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.health.domain.HealthMedicineTags; +import com.intc.health.domain.vo.HealthMedicineTagsVo; +import com.intc.health.domain.dto.HealthMedicineTagsDto; +import com.intc.health.service.IHealthMedicineTagsService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 标签管理Controller diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineTagsRelController.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineTagsRelController.java similarity index 85% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineTagsRelController.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineTagsRelController.java index e33ba35..dce07bc 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineTagsRelController.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineTagsRelController.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.controller; +package com.intc.health.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.health.domain.HealthMedicineTagsRel; -import com.ruoyi.health.domain.vo.HealthMedicineTagsRelVo; -import com.ruoyi.health.domain.dto.HealthMedicineTagsRelDto; -import com.ruoyi.health.service.IHealthMedicineTagsRelService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.health.domain.HealthMedicineTagsRel; +import com.intc.health.domain.vo.HealthMedicineTagsRelVo; +import com.intc.health.domain.dto.HealthMedicineTagsRelDto; +import com.intc.health.service.IHealthMedicineTagsRelService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 药品标签关系Controller diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthPersonController.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthPersonController.java similarity index 85% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthPersonController.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthPersonController.java index 7f960ef..b97e163 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthPersonController.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthPersonController.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.controller; +package com.intc.health.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.health.domain.HealthPerson; -import com.ruoyi.health.domain.vo.HealthPersonVo; -import com.ruoyi.health.domain.dto.HealthPersonDto; -import com.ruoyi.health.service.IHealthPersonService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.health.domain.HealthPerson; +import com.intc.health.domain.vo.HealthPersonVo; +import com.intc.health.domain.dto.HealthPersonDto; +import com.intc.health.service.IHealthPersonService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 成员管理Controller diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthProcessRecordController.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthProcessRecordController.java similarity index 85% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthProcessRecordController.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthProcessRecordController.java index c0d5f23..5bd0116 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthProcessRecordController.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthProcessRecordController.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.controller; +package com.intc.health.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.health.domain.HealthProcessRecord; -import com.ruoyi.health.domain.vo.HealthProcessRecordVo; -import com.ruoyi.health.domain.dto.HealthProcessRecordDto; -import com.ruoyi.health.service.IHealthProcessRecordService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.health.domain.HealthProcessRecord; +import com.intc.health.domain.vo.HealthProcessRecordVo; +import com.intc.health.domain.dto.HealthProcessRecordDto; +import com.intc.health.service.IHealthProcessRecordService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 档案过程记录Controller diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthRecordController.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthRecordController.java similarity index 85% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthRecordController.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthRecordController.java index ccaf89e..f8f591d 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthRecordController.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthRecordController.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.controller; +package com.intc.health.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.health.domain.HealthRecord; -import com.ruoyi.health.domain.vo.HealthRecordVo; -import com.ruoyi.health.domain.dto.HealthRecordDto; -import com.ruoyi.health.service.IHealthRecordService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.health.domain.HealthRecord; +import com.intc.health.domain.vo.HealthRecordVo; +import com.intc.health.domain.dto.HealthRecordDto; +import com.intc.health.service.IHealthRecordService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 健康档案Controller diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthTemperatureRecordController.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthTemperatureRecordController.java similarity index 85% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthTemperatureRecordController.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthTemperatureRecordController.java index e961aea..6c2b4d5 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthTemperatureRecordController.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthTemperatureRecordController.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.controller; +package com.intc.health.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.health.domain.HealthTemperatureRecord; -import com.ruoyi.health.domain.vo.HealthTemperatureRecordVo; -import com.ruoyi.health.domain.dto.HealthTemperatureRecordDto; -import com.ruoyi.health.service.IHealthTemperatureRecordService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.health.domain.HealthTemperatureRecord; +import com.intc.health.domain.vo.HealthTemperatureRecordVo; +import com.intc.health.domain.dto.HealthTemperatureRecordDto; +import com.intc.health.service.IHealthTemperatureRecordService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 体温记录Controller diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/StatisticAnalysisController.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/StatisticAnalysisController.java similarity index 89% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/StatisticAnalysisController.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/StatisticAnalysisController.java index e0c5c97..acf64d1 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/StatisticAnalysisController.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/controller/StatisticAnalysisController.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.controller; +package com.intc.health.controller; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.health.domain.dto.AnalysisDto; -import com.ruoyi.health.service.IStatisticAnalysisService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.health.domain.dto.AnalysisDto; +import com.intc.health.service.IStatisticAnalysisService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthActivity.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthActivity.java similarity index 95% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthActivity.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthActivity.java index 9988a13..873e434 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthActivity.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthActivity.java @@ -1,8 +1,8 @@ -package com.ruoyi.health.domain; +package com.intc.health.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDiseases.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDiseases.java similarity index 95% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDiseases.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDiseases.java index 06b0a41..d4f9c30 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDiseases.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDiseases.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.domain; +package com.intc.health.domain; 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.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecord.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecord.java similarity index 96% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecord.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecord.java index 0adfd7c..0484bb6 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecord.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecord.java @@ -1,8 +1,8 @@ -package com.ruoyi.health.domain; +package com.intc.health.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecordCost.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecordCost.java similarity index 95% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecordCost.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecordCost.java index f131690..be292f4 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecordCost.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthDoctorRecordCost.java @@ -1,8 +1,8 @@ -package com.ruoyi.health.domain; +package com.intc.health.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthHeightWeightRecord.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthHeightWeightRecord.java similarity index 93% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthHeightWeightRecord.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthHeightWeightRecord.java index 9055002..fa39eca 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthHeightWeightRecord.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthHeightWeightRecord.java @@ -1,8 +1,8 @@ -package com.ruoyi.health.domain; +package com.intc.health.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMarRecord.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMarRecord.java similarity index 96% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMarRecord.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMarRecord.java index a37893b..f063b6a 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMarRecord.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMarRecord.java @@ -1,8 +1,8 @@ -package com.ruoyi.health.domain; +package com.intc.health.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineBasic.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineBasic.java similarity index 97% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineBasic.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineBasic.java index 8e6e92a..9463645 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineBasic.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineBasic.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.domain; +package com.intc.health.domain; 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.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineRealtimeStock.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineRealtimeStock.java similarity index 91% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineRealtimeStock.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineRealtimeStock.java index a0e11ea..c57e09e 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineRealtimeStock.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineRealtimeStock.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.domain; +package com.intc.health.domain; 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.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineStockIn.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineStockIn.java similarity index 97% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineStockIn.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineStockIn.java index a1df127..b4d319d 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineStockIn.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineStockIn.java @@ -1,8 +1,8 @@ -package com.ruoyi.health.domain; +package com.intc.health.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineTags.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineTags.java similarity index 94% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineTags.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineTags.java index 4df9a71..2a466b4 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineTags.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineTags.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.domain; +package com.intc.health.domain; 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.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineTagsRel.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineTagsRel.java similarity index 91% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineTagsRel.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineTagsRel.java index 29c1f7e..008263a 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineTagsRel.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthMedicineTagsRel.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.domain; +package com.intc.health.domain; 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.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthPerson.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthPerson.java similarity index 95% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthPerson.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthPerson.java index 60f63d3..95e8f13 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthPerson.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthPerson.java @@ -1,8 +1,8 @@ -package com.ruoyi.health.domain; +package com.intc.health.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthProcessRecord.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthProcessRecord.java similarity index 93% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthProcessRecord.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthProcessRecord.java index 9459ec2..edc1732 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthProcessRecord.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthProcessRecord.java @@ -1,8 +1,8 @@ -package com.ruoyi.health.domain; +package com.intc.health.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthRecord.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthRecord.java similarity index 96% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthRecord.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthRecord.java index 4589260..da7c42c 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthRecord.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthRecord.java @@ -1,8 +1,8 @@ -package com.ruoyi.health.domain; +package com.intc.health.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthTemperatureRecord.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthTemperatureRecord.java similarity index 93% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthTemperatureRecord.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthTemperatureRecord.java index 1eb5127..9907d79 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthTemperatureRecord.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/HealthTemperatureRecord.java @@ -1,8 +1,8 @@ -package com.ruoyi.health.domain; +package com.intc.health.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/AnalysisDto.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/AnalysisDto.java similarity index 91% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/AnalysisDto.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/AnalysisDto.java index cb3b171..1759fa0 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/AnalysisDto.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/AnalysisDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.health.domain.dto; +package com.intc.health.domain.dto; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthActivityDto.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthActivityDto.java similarity index 92% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthActivityDto.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthActivityDto.java index fc093e4..7c5cdf5 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthActivityDto.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthActivityDto.java @@ -1,7 +1,7 @@ -package com.ruoyi.health.domain.dto; +package com.intc.health.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDiseasesDto.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDiseasesDto.java similarity index 94% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDiseasesDto.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDiseasesDto.java index 7e7b9c8..42bd3c3 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDiseasesDto.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDiseasesDto.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.domain.dto; +package com.intc.health.domain.dto; import lombok.Data; import java.io.Serializable; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDoctorRecordCostDto.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDoctorRecordCostDto.java similarity index 96% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDoctorRecordCostDto.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDoctorRecordCostDto.java index 6feca69..f5ff0a1 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDoctorRecordCostDto.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDoctorRecordCostDto.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.domain.dto; +package com.intc.health.domain.dto; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDoctorRecordDto.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDoctorRecordDto.java similarity index 93% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDoctorRecordDto.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDoctorRecordDto.java index 2993f7a..4736bb0 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDoctorRecordDto.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthDoctorRecordDto.java @@ -1,7 +1,7 @@ -package com.ruoyi.health.domain.dto; +package com.intc.health.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthHeightWeightRecordDto.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthHeightWeightRecordDto.java similarity index 92% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthHeightWeightRecordDto.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthHeightWeightRecordDto.java index 4d80c4e..0be8e4d 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthHeightWeightRecordDto.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthHeightWeightRecordDto.java @@ -1,7 +1,7 @@ -package com.ruoyi.health.domain.dto; +package com.intc.health.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMarRecordDto.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMarRecordDto.java similarity index 94% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMarRecordDto.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMarRecordDto.java index a9fe805..1f817d2 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMarRecordDto.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMarRecordDto.java @@ -1,7 +1,7 @@ -package com.ruoyi.health.domain.dto; +package com.intc.health.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineBasicDto.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineBasicDto.java similarity index 97% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineBasicDto.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineBasicDto.java index 3f04109..0c5e6ff 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineBasicDto.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineBasicDto.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.domain.dto; +package com.intc.health.domain.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineRealtimeStockDto.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineRealtimeStockDto.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineRealtimeStockDto.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineRealtimeStockDto.java index 01f487a..df7c74b 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineRealtimeStockDto.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineRealtimeStockDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.health.domain.dto; +package com.intc.health.domain.dto; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineStockInDto.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineStockInDto.java similarity index 95% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineStockInDto.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineStockInDto.java index 22e9992..3810fc1 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineStockInDto.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineStockInDto.java @@ -1,7 +1,7 @@ -package com.ruoyi.health.domain.dto; +package com.intc.health.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineTagsDto.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineTagsDto.java similarity index 94% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineTagsDto.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineTagsDto.java index d7946dd..5ceaf03 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineTagsDto.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineTagsDto.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.domain.dto; +package com.intc.health.domain.dto; import lombok.Data; import java.io.Serializable; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineTagsRelDto.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineTagsRelDto.java similarity index 94% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineTagsRelDto.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineTagsRelDto.java index d86aa28..bb00cd1 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineTagsRelDto.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthMedicineTagsRelDto.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.domain.dto; +package com.intc.health.domain.dto; import lombok.Data; import java.io.Serializable; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthPersonDto.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthPersonDto.java similarity index 88% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthPersonDto.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthPersonDto.java index fdd6bba..aa0aa0f 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthPersonDto.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthPersonDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.health.domain.dto; +package com.intc.health.domain.dto; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthProcessRecordDto.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthProcessRecordDto.java similarity index 92% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthProcessRecordDto.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthProcessRecordDto.java index 89ee782..4bb7f69 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthProcessRecordDto.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthProcessRecordDto.java @@ -1,7 +1,7 @@ -package com.ruoyi.health.domain.dto; +package com.intc.health.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthRecordDto.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthRecordDto.java similarity index 92% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthRecordDto.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthRecordDto.java index 1e8d43e..913a85b 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthRecordDto.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthRecordDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.health.domain.dto; +package com.intc.health.domain.dto; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthTemperatureRecordDto.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthTemperatureRecordDto.java similarity index 92% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthTemperatureRecordDto.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthTemperatureRecordDto.java index 7ea7325..e00450a 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthTemperatureRecordDto.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/dto/HealthTemperatureRecordDto.java @@ -1,7 +1,7 @@ -package com.ruoyi.health.domain.dto; +package com.intc.health.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthActivityVo.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthActivityVo.java similarity index 82% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthActivityVo.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthActivityVo.java index 036e140..636fbb4 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthActivityVo.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthActivityVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.health.domain.vo; +package com.intc.health.domain.vo; -import com.ruoyi.health.domain.HealthActivity; +import com.intc.health.domain.HealthActivity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthDiseasesVo.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthDiseasesVo.java similarity index 76% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthDiseasesVo.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthDiseasesVo.java index cbf7793..61574fa 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthDiseasesVo.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthDiseasesVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.health.domain.vo; +package com.intc.health.domain.vo; -import com.ruoyi.health.domain.HealthDiseases; +import com.intc.health.domain.HealthDiseases; import lombok.Data; import io.swagger.annotations.ApiModel; /** diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthDoctorRecordCostVo.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthDoctorRecordCostVo.java similarity index 76% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthDoctorRecordCostVo.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthDoctorRecordCostVo.java index 8a6496f..e1f8202 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthDoctorRecordCostVo.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthDoctorRecordCostVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.health.domain.vo; +package com.intc.health.domain.vo; -import com.ruoyi.health.domain.HealthDoctorRecordCost; +import com.intc.health.domain.HealthDoctorRecordCost; import lombok.Data; import io.swagger.annotations.ApiModel; /** diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthDoctorRecordVo.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthDoctorRecordVo.java similarity index 82% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthDoctorRecordVo.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthDoctorRecordVo.java index bb6c652..51c079d 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthDoctorRecordVo.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthDoctorRecordVo.java @@ -1,7 +1,7 @@ -package com.ruoyi.health.domain.vo; +package com.intc.health.domain.vo; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.health.domain.HealthDoctorRecord; +import com.intc.common.core.annotation.Excel; +import com.intc.health.domain.HealthDoctorRecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthHeightWeightRecordVo.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthHeightWeightRecordVo.java similarity index 77% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthHeightWeightRecordVo.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthHeightWeightRecordVo.java index 2709861..2fc5cd4 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthHeightWeightRecordVo.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthHeightWeightRecordVo.java @@ -1,7 +1,7 @@ -package com.ruoyi.health.domain.vo; +package com.intc.health.domain.vo; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.health.domain.HealthHeightWeightRecord; +import com.intc.common.core.annotation.Excel; +import com.intc.health.domain.HealthHeightWeightRecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMarRecordVo.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMarRecordVo.java similarity index 88% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMarRecordVo.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMarRecordVo.java index 9bf84f5..80dcc21 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMarRecordVo.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMarRecordVo.java @@ -1,7 +1,7 @@ -package com.ruoyi.health.domain.vo; +package com.intc.health.domain.vo; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.health.domain.HealthMarRecord; +import com.intc.common.core.annotation.Excel; +import com.intc.health.domain.HealthMarRecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineBasicVo.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineBasicVo.java similarity index 85% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineBasicVo.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineBasicVo.java index 19492a1..9cdb7d5 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineBasicVo.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineBasicVo.java @@ -1,7 +1,7 @@ -package com.ruoyi.health.domain.vo; +package com.intc.health.domain.vo; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.health.domain.HealthMedicineBasic; +import com.intc.common.core.annotation.Excel; +import com.intc.health.domain.HealthMedicineBasic; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineRealtimeStockVo.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineRealtimeStockVo.java similarity index 76% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineRealtimeStockVo.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineRealtimeStockVo.java index 69dae72..cd25ef4 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineRealtimeStockVo.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineRealtimeStockVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.health.domain.vo; +package com.intc.health.domain.vo; -import com.ruoyi.health.domain.HealthMedicineRealtimeStock; +import com.intc.health.domain.HealthMedicineRealtimeStock; import lombok.Data; import io.swagger.annotations.ApiModel; /** diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineStockInVo.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineStockInVo.java similarity index 77% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineStockInVo.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineStockInVo.java index cb15edf..33d6a0a 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineStockInVo.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineStockInVo.java @@ -1,7 +1,7 @@ -package com.ruoyi.health.domain.vo; +package com.intc.health.domain.vo; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.health.domain.HealthMedicineStockIn; +import com.intc.common.core.annotation.Excel; +import com.intc.health.domain.HealthMedicineStockIn; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineTagsRelVo.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineTagsRelVo.java similarity index 76% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineTagsRelVo.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineTagsRelVo.java index 341c950..13c5071 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineTagsRelVo.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineTagsRelVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.health.domain.vo; +package com.intc.health.domain.vo; -import com.ruoyi.health.domain.HealthMedicineTagsRel; +import com.intc.health.domain.HealthMedicineTagsRel; import lombok.Data; import io.swagger.annotations.ApiModel; /** diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineTagsVo.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineTagsVo.java similarity index 75% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineTagsVo.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineTagsVo.java index e6ac1a9..61836bd 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineTagsVo.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthMedicineTagsVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.health.domain.vo; +package com.intc.health.domain.vo; -import com.ruoyi.health.domain.HealthMedicineTags; +import com.intc.health.domain.HealthMedicineTags; import lombok.Data; import io.swagger.annotations.ApiModel; /** diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthPersonVo.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthPersonVo.java similarity index 75% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthPersonVo.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthPersonVo.java index 5c16d97..2a017b8 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthPersonVo.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthPersonVo.java @@ -1,7 +1,7 @@ -package com.ruoyi.health.domain.vo; +package com.intc.health.domain.vo; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.health.domain.HealthPerson; +import com.intc.common.core.annotation.Excel; +import com.intc.health.domain.HealthPerson; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthProcessRecordVo.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthProcessRecordVo.java similarity index 81% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthProcessRecordVo.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthProcessRecordVo.java index c2cb780..c878a1a 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthProcessRecordVo.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthProcessRecordVo.java @@ -1,7 +1,7 @@ -package com.ruoyi.health.domain.vo; +package com.intc.health.domain.vo; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.health.domain.HealthProcessRecord; +import com.intc.common.core.annotation.Excel; +import com.intc.health.domain.HealthProcessRecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthRecordVo.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthRecordVo.java similarity index 84% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthRecordVo.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthRecordVo.java index f98a30b..f4e3063 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthRecordVo.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthRecordVo.java @@ -1,7 +1,7 @@ -package com.ruoyi.health.domain.vo; +package com.intc.health.domain.vo; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.health.domain.HealthRecord; +import com.intc.common.core.annotation.Excel; +import com.intc.health.domain.HealthRecord; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthStaticAnalysisVo.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthStaticAnalysisVo.java similarity index 94% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthStaticAnalysisVo.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthStaticAnalysisVo.java index 34eb68e..8405a07 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthStaticAnalysisVo.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthStaticAnalysisVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.domain.vo; +package com.intc.health.domain.vo; import io.swagger.annotations.ApiModel; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthStaticPersonVo.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthStaticPersonVo.java similarity index 94% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthStaticPersonVo.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthStaticPersonVo.java index e795184..7bdd23a 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthStaticPersonVo.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthStaticPersonVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.health.domain.vo; +package com.intc.health.domain.vo; import io.swagger.annotations.ApiModel; import lombok.Data; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthTemperatureRecordVo.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthTemperatureRecordVo.java similarity index 81% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthTemperatureRecordVo.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthTemperatureRecordVo.java index 0300223..e17803d 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthTemperatureRecordVo.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthTemperatureRecordVo.java @@ -1,7 +1,7 @@ -package com.ruoyi.health.domain.vo; +package com.intc.health.domain.vo; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.health.domain.HealthTemperatureRecord; +import com.intc.common.core.annotation.Excel; +import com.intc.health.domain.HealthTemperatureRecord; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthActivityMapper.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthActivityMapper.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthActivityMapper.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthActivityMapper.java index baa423d..8f1c897 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthActivityMapper.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthActivityMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.mapper; +package com.intc.health.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.health.domain.HealthActivity; -import com.ruoyi.health.domain.dto.HealthActivityDto; -import com.ruoyi.health.domain.vo.HealthActivityVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.health.domain.HealthActivity; +import com.intc.health.domain.dto.HealthActivityDto; +import com.intc.health.domain.vo.HealthActivityVo; import java.util.List; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthDiseasesMapper.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthDiseasesMapper.java similarity index 90% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthDiseasesMapper.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthDiseasesMapper.java index c97b8b7..b7d28c8 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthDiseasesMapper.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthDiseasesMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.mapper; +package com.intc.health.mapper; import java.util.List; -import com.ruoyi.health.domain.HealthDiseases; -import com.ruoyi.health.domain.dto.HealthDiseasesDto; -import com.ruoyi.health.domain.vo.HealthDiseasesVo; +import com.intc.health.domain.HealthDiseases; +import com.intc.health.domain.dto.HealthDiseasesDto; +import com.intc.health.domain.vo.HealthDiseasesVo; /** * 常见疾病治疗Mapper接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthDoctorRecordCostMapper.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthDoctorRecordCostMapper.java similarity index 90% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthDoctorRecordCostMapper.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthDoctorRecordCostMapper.java index bda6be2..26fb023 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthDoctorRecordCostMapper.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthDoctorRecordCostMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.mapper; +package com.intc.health.mapper; import java.util.List; -import com.ruoyi.health.domain.HealthDoctorRecordCost; -import com.ruoyi.health.domain.dto.HealthDoctorRecordCostDto; -import com.ruoyi.health.domain.vo.HealthDoctorRecordCostVo; +import com.intc.health.domain.HealthDoctorRecordCost; +import com.intc.health.domain.dto.HealthDoctorRecordCostDto; +import com.intc.health.domain.vo.HealthDoctorRecordCostVo; /** * 就医记录费用明细Mapper接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthDoctorRecordMapper.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthDoctorRecordMapper.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthDoctorRecordMapper.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthDoctorRecordMapper.java index d312399..9f6f204 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthDoctorRecordMapper.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthDoctorRecordMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.mapper; +package com.intc.health.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.health.domain.HealthDoctorRecord; -import com.ruoyi.health.domain.dto.HealthDoctorRecordDto; -import com.ruoyi.health.domain.vo.HealthDoctorRecordVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.health.domain.HealthDoctorRecord; +import com.intc.health.domain.dto.HealthDoctorRecordDto; +import com.intc.health.domain.vo.HealthDoctorRecordVo; import java.util.List; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthHeightWeightRecordMapper.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthHeightWeightRecordMapper.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthHeightWeightRecordMapper.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthHeightWeightRecordMapper.java index 0c05440..0a8c2ff 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthHeightWeightRecordMapper.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthHeightWeightRecordMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.mapper; +package com.intc.health.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.health.domain.HealthHeightWeightRecord; -import com.ruoyi.health.domain.dto.HealthHeightWeightRecordDto; -import com.ruoyi.health.domain.vo.HealthHeightWeightRecordVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.health.domain.HealthHeightWeightRecord; +import com.intc.health.domain.dto.HealthHeightWeightRecordDto; +import com.intc.health.domain.vo.HealthHeightWeightRecordVo; import java.util.List; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMarRecordMapper.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMarRecordMapper.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMarRecordMapper.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMarRecordMapper.java index b3e1e96..65abc2b 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMarRecordMapper.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMarRecordMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.mapper; +package com.intc.health.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.health.domain.HealthMarRecord; -import com.ruoyi.health.domain.dto.HealthMarRecordDto; -import com.ruoyi.health.domain.vo.HealthMarRecordVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.health.domain.HealthMarRecord; +import com.intc.health.domain.dto.HealthMarRecordDto; +import com.intc.health.domain.vo.HealthMarRecordVo; import java.util.List; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineBasicMapper.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineBasicMapper.java similarity index 90% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineBasicMapper.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineBasicMapper.java index d8c07e4..4734674 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineBasicMapper.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineBasicMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.mapper; +package com.intc.health.mapper; import java.util.List; -import com.ruoyi.health.domain.HealthMedicineBasic; -import com.ruoyi.health.domain.dto.HealthMedicineBasicDto; -import com.ruoyi.health.domain.vo.HealthMedicineBasicVo; +import com.intc.health.domain.HealthMedicineBasic; +import com.intc.health.domain.dto.HealthMedicineBasicDto; +import com.intc.health.domain.vo.HealthMedicineBasicVo; /** * 药品基础信息Mapper接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineRealtimeStockMapper.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineRealtimeStockMapper.java similarity index 89% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineRealtimeStockMapper.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineRealtimeStockMapper.java index f6805f1..c794e22 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineRealtimeStockMapper.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineRealtimeStockMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.mapper; +package com.intc.health.mapper; import java.util.List; -import com.ruoyi.health.domain.HealthMedicineRealtimeStock; -import com.ruoyi.health.domain.dto.HealthMedicineRealtimeStockDto; -import com.ruoyi.health.domain.vo.HealthMedicineRealtimeStockVo; +import com.intc.health.domain.HealthMedicineRealtimeStock; +import com.intc.health.domain.dto.HealthMedicineRealtimeStockDto; +import com.intc.health.domain.vo.HealthMedicineRealtimeStockVo; /** * 药品实时库存Mapper接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineStockInMapper.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineStockInMapper.java similarity index 89% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineStockInMapper.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineStockInMapper.java index c5d8bf3..bb9b7a5 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineStockInMapper.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineStockInMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.mapper; +package com.intc.health.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.health.domain.HealthMedicineStockIn; -import com.ruoyi.health.domain.dto.HealthMedicineStockInDto; -import com.ruoyi.health.domain.vo.HealthMedicineStockInVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.health.domain.HealthMedicineStockIn; +import com.intc.health.domain.dto.HealthMedicineStockInDto; +import com.intc.health.domain.vo.HealthMedicineStockInVo; import java.util.List; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineTagsMapper.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineTagsMapper.java similarity index 89% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineTagsMapper.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineTagsMapper.java index 13ba3e2..5cf874b 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineTagsMapper.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineTagsMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.mapper; +package com.intc.health.mapper; import java.util.List; -import com.ruoyi.health.domain.HealthMedicineTags; -import com.ruoyi.health.domain.dto.HealthMedicineTagsDto; -import com.ruoyi.health.domain.vo.HealthMedicineTagsVo; +import com.intc.health.domain.HealthMedicineTags; +import com.intc.health.domain.dto.HealthMedicineTagsDto; +import com.intc.health.domain.vo.HealthMedicineTagsVo; /** * 标签管理Mapper接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineTagsRelMapper.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineTagsRelMapper.java similarity index 89% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineTagsRelMapper.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineTagsRelMapper.java index d878c55..b0ca010 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineTagsRelMapper.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthMedicineTagsRelMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.mapper; +package com.intc.health.mapper; import java.util.List; -import com.ruoyi.health.domain.HealthMedicineTagsRel; -import com.ruoyi.health.domain.dto.HealthMedicineTagsRelDto; -import com.ruoyi.health.domain.vo.HealthMedicineTagsRelVo; +import com.intc.health.domain.HealthMedicineTagsRel; +import com.intc.health.domain.dto.HealthMedicineTagsRelDto; +import com.intc.health.domain.vo.HealthMedicineTagsRelVo; /** * 药品标签关系Mapper接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthPersonMapper.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthPersonMapper.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthPersonMapper.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthPersonMapper.java index c7ed073..661323e 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthPersonMapper.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthPersonMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.mapper; +package com.intc.health.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.health.domain.HealthPerson; -import com.ruoyi.health.domain.dto.HealthPersonDto; -import com.ruoyi.health.domain.vo.HealthPersonVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.health.domain.HealthPerson; +import com.intc.health.domain.dto.HealthPersonDto; +import com.intc.health.domain.vo.HealthPersonVo; import java.util.List; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthProcessRecordMapper.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthProcessRecordMapper.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthProcessRecordMapper.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthProcessRecordMapper.java index 7108ad9..0b90986 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthProcessRecordMapper.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthProcessRecordMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.mapper; +package com.intc.health.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.health.domain.HealthProcessRecord; -import com.ruoyi.health.domain.dto.HealthProcessRecordDto; -import com.ruoyi.health.domain.vo.HealthProcessRecordVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.health.domain.HealthProcessRecord; +import com.intc.health.domain.dto.HealthProcessRecordDto; +import com.intc.health.domain.vo.HealthProcessRecordVo; import java.util.List; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthRecordMapper.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthRecordMapper.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthRecordMapper.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthRecordMapper.java index 9b184c6..cf4102e 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthRecordMapper.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthRecordMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.mapper; +package com.intc.health.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.health.domain.HealthRecord; -import com.ruoyi.health.domain.dto.HealthRecordDto; -import com.ruoyi.health.domain.vo.HealthRecordVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.health.domain.HealthRecord; +import com.intc.health.domain.dto.HealthRecordDto; +import com.intc.health.domain.vo.HealthRecordVo; import java.util.List; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthTemperatureRecordMapper.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthTemperatureRecordMapper.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthTemperatureRecordMapper.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthTemperatureRecordMapper.java index 48b5c8b..7ca5369 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthTemperatureRecordMapper.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/HealthTemperatureRecordMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.mapper; +package com.intc.health.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.health.domain.HealthTemperatureRecord; -import com.ruoyi.health.domain.dto.HealthTemperatureRecordDto; -import com.ruoyi.health.domain.vo.HealthTemperatureRecordVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.health.domain.HealthTemperatureRecord; +import com.intc.health.domain.dto.HealthTemperatureRecordDto; +import com.intc.health.domain.vo.HealthTemperatureRecordVo; import java.util.List; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/StatisticAnalysisMapper.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/StatisticAnalysisMapper.java similarity index 88% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/StatisticAnalysisMapper.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/StatisticAnalysisMapper.java index dc5cbec..d81b522 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/mapper/StatisticAnalysisMapper.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/mapper/StatisticAnalysisMapper.java @@ -1,13 +1,13 @@ -package com.ruoyi.health.mapper; +package com.intc.health.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.health.domain.dto.HealthDoctorRecordDto; -import com.ruoyi.health.domain.dto.HealthMarRecordDto; -import com.ruoyi.health.domain.dto.HealthRecordDto; -import com.ruoyi.health.domain.vo.HealthDoctorRecordVo; -import com.ruoyi.health.domain.vo.HealthMarRecordVo; -import com.ruoyi.health.domain.vo.HealthRecordVo; -import com.ruoyi.health.domain.vo.HealthStaticPersonVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.health.domain.dto.HealthDoctorRecordDto; +import com.intc.health.domain.dto.HealthMarRecordDto; +import com.intc.health.domain.dto.HealthRecordDto; +import com.intc.health.domain.vo.HealthDoctorRecordVo; +import com.intc.health.domain.vo.HealthMarRecordVo; +import com.intc.health.domain.vo.HealthRecordVo; +import com.intc.health.domain.vo.HealthStaticPersonVo; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthActivityService.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthActivityService.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthActivityService.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthActivityService.java index 9be3ca2..e5b54dc 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthActivityService.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthActivityService.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.service; +package com.intc.health.service; import java.util.List; -import com.ruoyi.health.domain.HealthActivity; -import com.ruoyi.health.domain.dto.HealthActivityDto; -import com.ruoyi.health.domain.vo.HealthActivityVo; +import com.intc.health.domain.HealthActivity; +import com.intc.health.domain.dto.HealthActivityDto; +import com.intc.health.domain.vo.HealthActivityVo; /** * 活动记录Service接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthDiseasesService.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthDiseasesService.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthDiseasesService.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthDiseasesService.java index eed64e4..6c340db 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthDiseasesService.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthDiseasesService.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.service; +package com.intc.health.service; import java.util.List; -import com.ruoyi.health.domain.HealthDiseases; -import com.ruoyi.health.domain.dto.HealthDiseasesDto; -import com.ruoyi.health.domain.vo.HealthDiseasesVo; +import com.intc.health.domain.HealthDiseases; +import com.intc.health.domain.dto.HealthDiseasesDto; +import com.intc.health.domain.vo.HealthDiseasesVo; /** * 常见疾病治疗Service接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthDoctorRecordCostService.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthDoctorRecordCostService.java similarity index 88% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthDoctorRecordCostService.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthDoctorRecordCostService.java index 5f11780..4e2d5ab 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthDoctorRecordCostService.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthDoctorRecordCostService.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.service; +package com.intc.health.service; import java.util.List; -import com.ruoyi.health.domain.HealthDoctorRecordCost; -import com.ruoyi.health.domain.dto.HealthDoctorRecordCostDto; -import com.ruoyi.health.domain.vo.HealthDoctorRecordCostVo; +import com.intc.health.domain.HealthDoctorRecordCost; +import com.intc.health.domain.dto.HealthDoctorRecordCostDto; +import com.intc.health.domain.vo.HealthDoctorRecordCostVo; /** * 就医记录费用明细Service接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthDoctorRecordService.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthDoctorRecordService.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthDoctorRecordService.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthDoctorRecordService.java index 2fc3927..ac65641 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthDoctorRecordService.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthDoctorRecordService.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.service; +package com.intc.health.service; import java.util.List; -import com.ruoyi.health.domain.HealthDoctorRecord; -import com.ruoyi.health.domain.dto.HealthDoctorRecordDto; -import com.ruoyi.health.domain.vo.HealthDoctorRecordVo; +import com.intc.health.domain.HealthDoctorRecord; +import com.intc.health.domain.dto.HealthDoctorRecordDto; +import com.intc.health.domain.vo.HealthDoctorRecordVo; /** * 就医记录Service接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthHeightWeightRecordService.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthHeightWeightRecordService.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthHeightWeightRecordService.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthHeightWeightRecordService.java index 94be067..d9fbcf0 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthHeightWeightRecordService.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthHeightWeightRecordService.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.service; +package com.intc.health.service; import java.util.List; -import com.ruoyi.health.domain.HealthHeightWeightRecord; -import com.ruoyi.health.domain.dto.HealthHeightWeightRecordDto; -import com.ruoyi.health.domain.vo.HealthHeightWeightRecordVo; +import com.intc.health.domain.HealthHeightWeightRecord; +import com.intc.health.domain.dto.HealthHeightWeightRecordDto; +import com.intc.health.domain.vo.HealthHeightWeightRecordVo; /** * 身高体重记录Service接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMarRecordService.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMarRecordService.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMarRecordService.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMarRecordService.java index e7e5ed0..45ad886 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMarRecordService.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMarRecordService.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.service; +package com.intc.health.service; import java.util.List; -import com.ruoyi.health.domain.HealthMarRecord; -import com.ruoyi.health.domain.dto.HealthMarRecordDto; -import com.ruoyi.health.domain.vo.HealthMarRecordVo; +import com.intc.health.domain.HealthMarRecord; +import com.intc.health.domain.dto.HealthMarRecordDto; +import com.intc.health.domain.vo.HealthMarRecordVo; /** * 用药记录Service接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineBasicService.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineBasicService.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineBasicService.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineBasicService.java index 6a8ac69..4713a46 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineBasicService.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineBasicService.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.service; +package com.intc.health.service; import java.util.List; -import com.ruoyi.health.domain.HealthMedicineBasic; -import com.ruoyi.health.domain.dto.HealthMedicineBasicDto; -import com.ruoyi.health.domain.vo.HealthMedicineBasicVo; +import com.intc.health.domain.HealthMedicineBasic; +import com.intc.health.domain.dto.HealthMedicineBasicDto; +import com.intc.health.domain.vo.HealthMedicineBasicVo; /** * 药品基础信息Service接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineRealtimeStockService.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineRealtimeStockService.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineRealtimeStockService.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineRealtimeStockService.java index 373ce71..c7e553a 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineRealtimeStockService.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineRealtimeStockService.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.service; +package com.intc.health.service; import java.util.List; -import com.ruoyi.health.domain.HealthMedicineRealtimeStock; -import com.ruoyi.health.domain.dto.HealthMedicineRealtimeStockDto; -import com.ruoyi.health.domain.vo.HealthMedicineRealtimeStockVo; +import com.intc.health.domain.HealthMedicineRealtimeStock; +import com.intc.health.domain.dto.HealthMedicineRealtimeStockDto; +import com.intc.health.domain.vo.HealthMedicineRealtimeStockVo; /** * 药品实时库存Service接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineStockInService.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineStockInService.java similarity index 89% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineStockInService.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineStockInService.java index 60872bb..8a8499a 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineStockInService.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineStockInService.java @@ -1,8 +1,8 @@ -package com.ruoyi.health.service; +package com.intc.health.service; -import com.ruoyi.health.domain.HealthMedicineStockIn; -import com.ruoyi.health.domain.dto.HealthMedicineStockInDto; -import com.ruoyi.health.domain.vo.HealthMedicineStockInVo; +import com.intc.health.domain.HealthMedicineStockIn; +import com.intc.health.domain.dto.HealthMedicineStockInDto; +import com.intc.health.domain.vo.HealthMedicineStockInVo; import java.util.List; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineTagsRelService.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineTagsRelService.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineTagsRelService.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineTagsRelService.java index 215b05c..8f55837 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineTagsRelService.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineTagsRelService.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.service; +package com.intc.health.service; import java.util.List; -import com.ruoyi.health.domain.HealthMedicineTagsRel; -import com.ruoyi.health.domain.dto.HealthMedicineTagsRelDto; -import com.ruoyi.health.domain.vo.HealthMedicineTagsRelVo; +import com.intc.health.domain.HealthMedicineTagsRel; +import com.intc.health.domain.dto.HealthMedicineTagsRelDto; +import com.intc.health.domain.vo.HealthMedicineTagsRelVo; /** * 药品标签关系Service接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineTagsService.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineTagsService.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineTagsService.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineTagsService.java index fdedbfa..96e078c 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineTagsService.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthMedicineTagsService.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.service; +package com.intc.health.service; import java.util.List; -import com.ruoyi.health.domain.HealthMedicineTags; -import com.ruoyi.health.domain.dto.HealthMedicineTagsDto; -import com.ruoyi.health.domain.vo.HealthMedicineTagsVo; +import com.intc.health.domain.HealthMedicineTags; +import com.intc.health.domain.dto.HealthMedicineTagsDto; +import com.intc.health.domain.vo.HealthMedicineTagsVo; /** * 标签管理Service接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthPersonService.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthPersonService.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthPersonService.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthPersonService.java index 9f355ff..26b8779 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthPersonService.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthPersonService.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.service; +package com.intc.health.service; import java.util.List; -import com.ruoyi.health.domain.HealthPerson; -import com.ruoyi.health.domain.dto.HealthPersonDto; -import com.ruoyi.health.domain.vo.HealthPersonVo; +import com.intc.health.domain.HealthPerson; +import com.intc.health.domain.dto.HealthPersonDto; +import com.intc.health.domain.vo.HealthPersonVo; /** * 成员管理Service接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthProcessRecordService.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthProcessRecordService.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthProcessRecordService.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthProcessRecordService.java index 571b4c3..6021e44 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthProcessRecordService.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthProcessRecordService.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.service; +package com.intc.health.service; import java.util.List; -import com.ruoyi.health.domain.HealthProcessRecord; -import com.ruoyi.health.domain.dto.HealthProcessRecordDto; -import com.ruoyi.health.domain.vo.HealthProcessRecordVo; +import com.intc.health.domain.HealthProcessRecord; +import com.intc.health.domain.dto.HealthProcessRecordDto; +import com.intc.health.domain.vo.HealthProcessRecordVo; /** * 档案过程记录Service接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthRecordService.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthRecordService.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthRecordService.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthRecordService.java index 6bd8122..f7f88c2 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthRecordService.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthRecordService.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.service; +package com.intc.health.service; import java.util.List; -import com.ruoyi.health.domain.HealthRecord; -import com.ruoyi.health.domain.dto.HealthRecordDto; -import com.ruoyi.health.domain.vo.HealthRecordVo; +import com.intc.health.domain.HealthRecord; +import com.intc.health.domain.dto.HealthRecordDto; +import com.intc.health.domain.vo.HealthRecordVo; /** * 健康档案Service接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthTemperatureRecordService.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthTemperatureRecordService.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthTemperatureRecordService.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthTemperatureRecordService.java index bd97209..baaed7c 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthTemperatureRecordService.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IHealthTemperatureRecordService.java @@ -1,9 +1,9 @@ -package com.ruoyi.health.service; +package com.intc.health.service; import java.util.List; -import com.ruoyi.health.domain.HealthTemperatureRecord; -import com.ruoyi.health.domain.dto.HealthTemperatureRecordDto; -import com.ruoyi.health.domain.vo.HealthTemperatureRecordVo; +import com.intc.health.domain.HealthTemperatureRecord; +import com.intc.health.domain.dto.HealthTemperatureRecordDto; +import com.intc.health.domain.vo.HealthTemperatureRecordVo; /** * 体温记录Service接口 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IStatisticAnalysisService.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IStatisticAnalysisService.java similarity index 85% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IStatisticAnalysisService.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IStatisticAnalysisService.java index a5a5c50..b32e7e6 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/IStatisticAnalysisService.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/IStatisticAnalysisService.java @@ -1,6 +1,6 @@ -package com.ruoyi.health.service; +package com.intc.health.service; -import com.ruoyi.health.domain.dto.AnalysisDto; +import com.intc.health.domain.dto.AnalysisDto; import java.util.Map; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthActivityServiceImpl.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthActivityServiceImpl.java similarity index 86% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthActivityServiceImpl.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthActivityServiceImpl.java index 4387e79..093cae2 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthActivityServiceImpl.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthActivityServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.health.service.impl; +package com.intc.health.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.health.domain.HealthActivity; -import com.ruoyi.health.domain.dto.HealthActivityDto; -import com.ruoyi.health.domain.vo.HealthActivityVo; -import com.ruoyi.health.mapper.HealthActivityMapper; -import com.ruoyi.health.service.IHealthActivityService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.health.domain.HealthActivity; +import com.intc.health.domain.dto.HealthActivityDto; +import com.intc.health.domain.vo.HealthActivityVo; +import com.intc.health.mapper.HealthActivityMapper; +import com.intc.health.service.IHealthActivityService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthDiseasesServiceImpl.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthDiseasesServiceImpl.java similarity index 84% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthDiseasesServiceImpl.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthDiseasesServiceImpl.java index 7b32e7b..4a733a7 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthDiseasesServiceImpl.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthDiseasesServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.health.service.impl; +package com.intc.health.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.health.domain.HealthDiseases; -import com.ruoyi.health.domain.dto.HealthDiseasesDto; -import com.ruoyi.health.domain.vo.HealthDiseasesVo; -import com.ruoyi.health.mapper.HealthDiseasesMapper; -import com.ruoyi.health.service.IHealthDiseasesService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.health.domain.HealthDiseases; +import com.intc.health.domain.dto.HealthDiseasesDto; +import com.intc.health.domain.vo.HealthDiseasesVo; +import com.intc.health.mapper.HealthDiseasesMapper; +import com.intc.health.service.IHealthDiseasesService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthDoctorRecordCostServiceImpl.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthDoctorRecordCostServiceImpl.java similarity index 85% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthDoctorRecordCostServiceImpl.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthDoctorRecordCostServiceImpl.java index 668c3ac..51f4d07 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthDoctorRecordCostServiceImpl.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthDoctorRecordCostServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.health.service.impl; +package com.intc.health.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.health.domain.HealthDoctorRecordCost; -import com.ruoyi.health.domain.dto.HealthDoctorRecordCostDto; -import com.ruoyi.health.domain.vo.HealthDoctorRecordCostVo; -import com.ruoyi.health.mapper.HealthDoctorRecordCostMapper; -import com.ruoyi.health.service.IHealthDoctorRecordCostService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.health.domain.HealthDoctorRecordCost; +import com.intc.health.domain.dto.HealthDoctorRecordCostDto; +import com.intc.health.domain.vo.HealthDoctorRecordCostVo; +import com.intc.health.mapper.HealthDoctorRecordCostMapper; +import com.intc.health.service.IHealthDoctorRecordCostService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthDoctorRecordServiceImpl.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthDoctorRecordServiceImpl.java similarity index 84% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthDoctorRecordServiceImpl.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthDoctorRecordServiceImpl.java index 6b6bafd..10950b2 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthDoctorRecordServiceImpl.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthDoctorRecordServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.health.service.impl; +package com.intc.health.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.health.domain.HealthDoctorRecord; -import com.ruoyi.health.domain.dto.HealthDoctorRecordDto; -import com.ruoyi.health.domain.vo.HealthDoctorRecordVo; -import com.ruoyi.health.mapper.HealthDoctorRecordMapper; -import com.ruoyi.health.service.IHealthDoctorRecordService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.health.domain.HealthDoctorRecord; +import com.intc.health.domain.dto.HealthDoctorRecordDto; +import com.intc.health.domain.vo.HealthDoctorRecordVo; +import com.intc.health.mapper.HealthDoctorRecordMapper; +import com.intc.health.service.IHealthDoctorRecordService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthHeightWeightRecordServiceImpl.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthHeightWeightRecordServiceImpl.java similarity index 85% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthHeightWeightRecordServiceImpl.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthHeightWeightRecordServiceImpl.java index 6bd9f58..5915a60 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthHeightWeightRecordServiceImpl.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthHeightWeightRecordServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.health.service.impl; +package com.intc.health.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.health.domain.HealthHeightWeightRecord; -import com.ruoyi.health.domain.dto.HealthHeightWeightRecordDto; -import com.ruoyi.health.domain.vo.HealthHeightWeightRecordVo; -import com.ruoyi.health.mapper.HealthHeightWeightRecordMapper; -import com.ruoyi.health.service.IHealthHeightWeightRecordService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.health.domain.HealthHeightWeightRecord; +import com.intc.health.domain.dto.HealthHeightWeightRecordDto; +import com.intc.health.domain.vo.HealthHeightWeightRecordVo; +import com.intc.health.mapper.HealthHeightWeightRecordMapper; +import com.intc.health.service.IHealthHeightWeightRecordService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMarRecordServiceImpl.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMarRecordServiceImpl.java similarity index 84% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMarRecordServiceImpl.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMarRecordServiceImpl.java index 1022435..120b1fa 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMarRecordServiceImpl.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMarRecordServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.health.service.impl; +package com.intc.health.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.health.domain.HealthMarRecord; -import com.ruoyi.health.domain.dto.HealthMarRecordDto; -import com.ruoyi.health.domain.vo.HealthMarRecordVo; -import com.ruoyi.health.mapper.HealthMarRecordMapper; -import com.ruoyi.health.service.IHealthMarRecordService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.health.domain.HealthMarRecord; +import com.intc.health.domain.dto.HealthMarRecordDto; +import com.intc.health.domain.vo.HealthMarRecordVo; +import com.intc.health.mapper.HealthMarRecordMapper; +import com.intc.health.service.IHealthMarRecordService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineBasicServiceImpl.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineBasicServiceImpl.java similarity index 87% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineBasicServiceImpl.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineBasicServiceImpl.java index 63bee93..f0427c6 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineBasicServiceImpl.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineBasicServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.health.service.impl; +package com.intc.health.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.health.domain.HealthMedicineBasic; -import com.ruoyi.health.domain.dto.HealthMedicineBasicDto; -import com.ruoyi.health.domain.vo.HealthMedicineBasicVo; -import com.ruoyi.health.mapper.HealthMedicineBasicMapper; -import com.ruoyi.health.service.IHealthMedicineBasicService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.health.domain.HealthMedicineBasic; +import com.intc.health.domain.dto.HealthMedicineBasicDto; +import com.intc.health.domain.vo.HealthMedicineBasicVo; +import com.intc.health.mapper.HealthMedicineBasicMapper; +import com.intc.health.service.IHealthMedicineBasicService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineRealtimeStockServiceImpl.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineRealtimeStockServiceImpl.java similarity index 86% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineRealtimeStockServiceImpl.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineRealtimeStockServiceImpl.java index 0350ba6..40571a8 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineRealtimeStockServiceImpl.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineRealtimeStockServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.health.service.impl; +package com.intc.health.service.impl; import java.util.List; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.security.utils.SecurityUtils; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.security.utils.SecurityUtils; import javax.annotation.Resource; import org.springframework.stereotype.Service; -import com.ruoyi.health.mapper.HealthMedicineRealtimeStockMapper; -import com.ruoyi.health.domain.HealthMedicineRealtimeStock; -import com.ruoyi.health.domain.dto.HealthMedicineRealtimeStockDto; -import com.ruoyi.health.domain.vo.HealthMedicineRealtimeStockVo; -import com.ruoyi.health.service.IHealthMedicineRealtimeStockService; +import com.intc.health.mapper.HealthMedicineRealtimeStockMapper; +import com.intc.health.domain.HealthMedicineRealtimeStock; +import com.intc.health.domain.dto.HealthMedicineRealtimeStockDto; +import com.intc.health.domain.vo.HealthMedicineRealtimeStockVo; +import com.intc.health.service.IHealthMedicineRealtimeStockService; /** * 药品实时库存Service业务层处理 diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineStockInServiceImpl.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineStockInServiceImpl.java similarity index 86% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineStockInServiceImpl.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineStockInServiceImpl.java index 9dd8641..a2c5c74 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineStockInServiceImpl.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineStockInServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.health.service.impl; +package com.intc.health.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.health.domain.HealthMedicineStockIn; -import com.ruoyi.health.domain.dto.HealthMedicineStockInDto; -import com.ruoyi.health.domain.vo.HealthMedicineStockInVo; -import com.ruoyi.health.mapper.HealthMedicineStockInMapper; -import com.ruoyi.health.service.IHealthMedicineStockInService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.health.domain.HealthMedicineStockIn; +import com.intc.health.domain.dto.HealthMedicineStockInDto; +import com.intc.health.domain.vo.HealthMedicineStockInVo; +import com.intc.health.mapper.HealthMedicineStockInMapper; +import com.intc.health.service.IHealthMedicineStockInService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineTagsRelServiceImpl.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineTagsRelServiceImpl.java similarity index 85% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineTagsRelServiceImpl.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineTagsRelServiceImpl.java index 94b8643..116ebb9 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineTagsRelServiceImpl.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineTagsRelServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.health.service.impl; +package com.intc.health.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.health.domain.HealthMedicineTagsRel; -import com.ruoyi.health.domain.dto.HealthMedicineTagsRelDto; -import com.ruoyi.health.domain.vo.HealthMedicineTagsRelVo; -import com.ruoyi.health.mapper.HealthMedicineTagsRelMapper; -import com.ruoyi.health.service.IHealthMedicineTagsRelService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.health.domain.HealthMedicineTagsRel; +import com.intc.health.domain.dto.HealthMedicineTagsRelDto; +import com.intc.health.domain.vo.HealthMedicineTagsRelVo; +import com.intc.health.mapper.HealthMedicineTagsRelMapper; +import com.intc.health.service.IHealthMedicineTagsRelService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineTagsServiceImpl.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineTagsServiceImpl.java similarity index 84% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineTagsServiceImpl.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineTagsServiceImpl.java index 678141e..6d81fcd 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineTagsServiceImpl.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthMedicineTagsServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.health.service.impl; +package com.intc.health.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.health.domain.HealthMedicineTags; -import com.ruoyi.health.domain.dto.HealthMedicineTagsDto; -import com.ruoyi.health.domain.vo.HealthMedicineTagsVo; -import com.ruoyi.health.mapper.HealthMedicineTagsMapper; -import com.ruoyi.health.service.IHealthMedicineTagsService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.health.domain.HealthMedicineTags; +import com.intc.health.domain.dto.HealthMedicineTagsDto; +import com.intc.health.domain.vo.HealthMedicineTagsVo; +import com.intc.health.mapper.HealthMedicineTagsMapper; +import com.intc.health.service.IHealthMedicineTagsService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthPersonServiceImpl.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthPersonServiceImpl.java similarity index 84% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthPersonServiceImpl.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthPersonServiceImpl.java index 641f20c..12dcc7d 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthPersonServiceImpl.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthPersonServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.health.service.impl; +package com.intc.health.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.health.domain.HealthPerson; -import com.ruoyi.health.domain.dto.HealthPersonDto; -import com.ruoyi.health.domain.vo.HealthPersonVo; -import com.ruoyi.health.mapper.HealthPersonMapper; -import com.ruoyi.health.service.IHealthPersonService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.health.domain.HealthPerson; +import com.intc.health.domain.dto.HealthPersonDto; +import com.intc.health.domain.vo.HealthPersonVo; +import com.intc.health.mapper.HealthPersonMapper; +import com.intc.health.service.IHealthPersonService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthProcessRecordServiceImpl.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthProcessRecordServiceImpl.java similarity index 84% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthProcessRecordServiceImpl.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthProcessRecordServiceImpl.java index 163444c..1bdb0e9 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthProcessRecordServiceImpl.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthProcessRecordServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.health.service.impl; +package com.intc.health.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.health.domain.HealthProcessRecord; -import com.ruoyi.health.domain.dto.HealthProcessRecordDto; -import com.ruoyi.health.domain.vo.HealthProcessRecordVo; -import com.ruoyi.health.mapper.HealthProcessRecordMapper; -import com.ruoyi.health.service.IHealthProcessRecordService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.health.domain.HealthProcessRecord; +import com.intc.health.domain.dto.HealthProcessRecordDto; +import com.intc.health.domain.vo.HealthProcessRecordVo; +import com.intc.health.mapper.HealthProcessRecordMapper; +import com.intc.health.service.IHealthProcessRecordService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthRecordServiceImpl.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthRecordServiceImpl.java similarity index 86% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthRecordServiceImpl.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthRecordServiceImpl.java index d0e5054..53aa0e1 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthRecordServiceImpl.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthRecordServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.health.service.impl; +package com.intc.health.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.health.domain.HealthRecord; -import com.ruoyi.health.domain.dto.HealthRecordDto; -import com.ruoyi.health.domain.vo.HealthRecordVo; -import com.ruoyi.health.mapper.HealthRecordMapper; -import com.ruoyi.health.service.IHealthRecordService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.health.domain.HealthRecord; +import com.intc.health.domain.dto.HealthRecordDto; +import com.intc.health.domain.vo.HealthRecordVo; +import com.intc.health.mapper.HealthRecordMapper; +import com.intc.health.service.IHealthRecordService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthTemperatureRecordServiceImpl.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthTemperatureRecordServiceImpl.java similarity index 84% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthTemperatureRecordServiceImpl.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthTemperatureRecordServiceImpl.java index 9429d69..717d719 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthTemperatureRecordServiceImpl.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/HealthTemperatureRecordServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.health.service.impl; +package com.intc.health.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.health.domain.HealthTemperatureRecord; -import com.ruoyi.health.domain.dto.HealthTemperatureRecordDto; -import com.ruoyi.health.domain.vo.HealthTemperatureRecordVo; -import com.ruoyi.health.mapper.HealthTemperatureRecordMapper; -import com.ruoyi.health.service.IHealthTemperatureRecordService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.health.domain.HealthTemperatureRecord; +import com.intc.health.domain.dto.HealthTemperatureRecordDto; +import com.intc.health.domain.vo.HealthTemperatureRecordVo; +import com.intc.health.mapper.HealthTemperatureRecordMapper; +import com.intc.health.service.IHealthTemperatureRecordService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/StatisticAnalysisImpl.java b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/StatisticAnalysisImpl.java similarity index 98% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/StatisticAnalysisImpl.java rename to intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/StatisticAnalysisImpl.java index 5343fa1..802d4e4 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/StatisticAnalysisImpl.java +++ b/intc-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/StatisticAnalysisImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.health.service.impl; +package com.intc.health.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.MillisecondsConverter; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.DictUtils; -import com.ruoyi.health.domain.dto.*; -import com.ruoyi.health.domain.vo.*; -import com.ruoyi.health.mapper.*; -import com.ruoyi.health.service.IStatisticAnalysisService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.MillisecondsConverter; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.utils.DictUtils; +import com.intc.health.domain.dto.*; +import com.intc.health.domain.vo.*; +import com.intc.health.mapper.*; +import com.intc.health.service.IStatisticAnalysisService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-health/src/main/resources/banner.txt b/intc-modules/intc-health/src/main/resources/banner.txt similarity index 100% rename from ruoyi-modules/intc-health/src/main/resources/banner.txt rename to intc-modules/intc-health/src/main/resources/banner.txt diff --git a/ruoyi-modules/intc-health/src/main/resources/bootstrap.yml b/intc-modules/intc-health/src/main/resources/bootstrap.yml similarity index 88% rename from ruoyi-modules/intc-health/src/main/resources/bootstrap.yml rename to intc-modules/intc-health/src/main/resources/bootstrap.yml index ac9fdb3..a54cfbd 100644 --- a/ruoyi-modules/intc-health/src/main/resources/bootstrap.yml +++ b/intc-modules/intc-health/src/main/resources/bootstrap.yml @@ -21,13 +21,13 @@ spring: cloud: nacos: discovery: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 服务注册地址 server-addr: 101.126.95.100:8858 group: intc ip: 101.126.95.100 config: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 配置中心地址 server-addr: 101.126.95.100:8858 # 配置文件格式 diff --git a/ruoyi-modules/intc-weixin/src/main/resources/logback.xml b/intc-modules/intc-health/src/main/resources/logback.xml similarity index 98% rename from ruoyi-modules/intc-weixin/src/main/resources/logback.xml rename to intc-modules/intc-health/src/main/resources/logback.xml index 0dc6014..2a2cca0 100644 --- a/ruoyi-modules/intc-weixin/src/main/resources/logback.xml +++ b/intc-modules/intc-health/src/main/resources/logback.xml @@ -58,7 +58,7 @@ - + diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthActivityMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/HealthActivityMapper.xml similarity index 99% rename from ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthActivityMapper.xml rename to intc-modules/intc-health/src/main/resources/mapper/health/HealthActivityMapper.xml index 0da12ef..11adb9b 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthActivityMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/HealthActivityMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDiseasesMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/HealthDiseasesMapper.xml similarity index 99% rename from ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDiseasesMapper.xml rename to intc-modules/intc-health/src/main/resources/mapper/health/HealthDiseasesMapper.xml index 3d36f94..5379cd4 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDiseasesMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/HealthDiseasesMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordCostMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordCostMapper.xml similarity index 99% rename from ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordCostMapper.xml rename to intc-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordCostMapper.xml index 185beaf..2606270 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordCostMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordCostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml similarity index 99% rename from ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml rename to intc-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml index c05a54e..25e397a 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthHeightWeightRecordMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/HealthHeightWeightRecordMapper.xml similarity index 98% rename from ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthHeightWeightRecordMapper.xml rename to intc-modules/intc-health/src/main/resources/mapper/health/HealthHeightWeightRecordMapper.xml index 68d1849..9c470f6 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthHeightWeightRecordMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/HealthHeightWeightRecordMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMarRecordMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/HealthMarRecordMapper.xml similarity index 99% rename from ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMarRecordMapper.xml rename to intc-modules/intc-health/src/main/resources/mapper/health/HealthMarRecordMapper.xml index 2ec0c29..0265e21 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMarRecordMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/HealthMarRecordMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineBasicMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/HealthMedicineBasicMapper.xml similarity index 99% rename from ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineBasicMapper.xml rename to intc-modules/intc-health/src/main/resources/mapper/health/HealthMedicineBasicMapper.xml index 5ff3cfd..38deabb 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineBasicMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/HealthMedicineBasicMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineRealtimeStockMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/HealthMedicineRealtimeStockMapper.xml similarity index 98% rename from ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineRealtimeStockMapper.xml rename to intc-modules/intc-health/src/main/resources/mapper/health/HealthMedicineRealtimeStockMapper.xml index 97a867b..79590e6 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineRealtimeStockMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/HealthMedicineRealtimeStockMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineStockInMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/HealthMedicineStockInMapper.xml similarity index 99% rename from ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineStockInMapper.xml rename to intc-modules/intc-health/src/main/resources/mapper/health/HealthMedicineStockInMapper.xml index b394dab..0c51e30 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineStockInMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/HealthMedicineStockInMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineTagsMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/HealthMedicineTagsMapper.xml similarity index 98% rename from ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineTagsMapper.xml rename to intc-modules/intc-health/src/main/resources/mapper/health/HealthMedicineTagsMapper.xml index 83bd58c..6e93f2e 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineTagsMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/HealthMedicineTagsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineTagsRelMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/HealthMedicineTagsRelMapper.xml similarity index 98% rename from ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineTagsRelMapper.xml rename to intc-modules/intc-health/src/main/resources/mapper/health/HealthMedicineTagsRelMapper.xml index d68cf6d..99daac8 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthMedicineTagsRelMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/HealthMedicineTagsRelMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthPersonMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/HealthPersonMapper.xml similarity index 99% rename from ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthPersonMapper.xml rename to intc-modules/intc-health/src/main/resources/mapper/health/HealthPersonMapper.xml index 7ee6cae..d536383 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthPersonMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/HealthPersonMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthProcessRecordMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/HealthProcessRecordMapper.xml similarity index 98% rename from ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthProcessRecordMapper.xml rename to intc-modules/intc-health/src/main/resources/mapper/health/HealthProcessRecordMapper.xml index 0a67505..ea0d6a4 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthProcessRecordMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/HealthProcessRecordMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthRecordMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/HealthRecordMapper.xml similarity index 99% rename from ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthRecordMapper.xml rename to intc-modules/intc-health/src/main/resources/mapper/health/HealthRecordMapper.xml index f4dc03b..a378a85 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthRecordMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/HealthRecordMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthTemperatureRecordMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/HealthTemperatureRecordMapper.xml similarity index 98% rename from ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthTemperatureRecordMapper.xml rename to intc-modules/intc-health/src/main/resources/mapper/health/HealthTemperatureRecordMapper.xml index 0109b54..8921e67 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthTemperatureRecordMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/HealthTemperatureRecordMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/StatisticAnalysisMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/StatisticAnalysisMapper.xml similarity index 97% rename from ruoyi-modules/intc-health/src/main/resources/mapper/health/StatisticAnalysisMapper.xml rename to intc-modules/intc-health/src/main/resources/mapper/health/StatisticAnalysisMapper.xml index e1219f1..03de897 100644 --- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/StatisticAnalysisMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/StatisticAnalysisMapper.xml @@ -2,7 +2,7 @@ - + @@ -238,7 +238,7 @@ ${params.dataScope} - select hp."name" as personName, ( @@ -324,7 +324,7 @@ order by hp.ranking - select ( select @@ -358,7 +358,7 @@ order by hr.occur_time - select ( select @@ -458,7 +458,7 @@ ${params.dataScope} order by hr.occur_time desc - select hmr.id, hmr.health_record_id as healthRecordId, @@ -524,7 +524,7 @@ ${params.dataScope} - select count(hmr.hospital_name) as count, hmr.hospital_name as hospitalName @@ -549,7 +549,7 @@ order by count(hmr.hospital_name) desc - select count(hmr.doctor) as count, hmr.doctor, @@ -575,7 +575,7 @@ order by count(hmr.doctor) desc - select count(hmr.departments) as count, hmr.departments as departments diff --git a/ruoyi-modules/intc-health/src/main/resources/static/images/qrcode_logo.jpg b/intc-modules/intc-health/src/main/resources/static/images/qrcode_logo.jpg similarity index 100% rename from ruoyi-modules/intc-health/src/main/resources/static/images/qrcode_logo.jpg rename to intc-modules/intc-health/src/main/resources/static/images/qrcode_logo.jpg diff --git a/ruoyi-modules/intc-health/src/main/resources/static/images/qrcode_template.jpg b/intc-modules/intc-health/src/main/resources/static/images/qrcode_template.jpg similarity index 100% rename from ruoyi-modules/intc-health/src/main/resources/static/images/qrcode_template.jpg rename to intc-modules/intc-health/src/main/resources/static/images/qrcode_template.jpg diff --git a/ruoyi-modules/intc-invest/README.md b/intc-modules/intc-invest/README.md similarity index 100% rename from ruoyi-modules/intc-invest/README.md rename to intc-modules/intc-invest/README.md diff --git a/ruoyi-modules/intc-invest/pom.xml b/intc-modules/intc-invest/pom.xml similarity index 89% rename from ruoyi-modules/intc-invest/pom.xml rename to intc-modules/intc-invest/pom.xml index f12701b..1ca62e4 100644 --- a/ruoyi-modules/intc-invest/pom.xml +++ b/intc-modules/intc-invest/pom.xml @@ -3,8 +3,8 @@ 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"> - com.ruoyi - ruoyi-modules + com.intc + intc-modules 3.6.3 4.0.0 @@ -65,15 +65,15 @@ - com.ruoyi - ruoyi-common-datasource + com.intc + intc-common-datasource 3.6.3 - com.ruoyi - ruoyi-common-datascope + com.intc + intc-common-datascope 3.6.3 @@ -91,14 +91,14 @@ - com.ruoyi - ruoyi-common-log + com.intc + intc-common-log - com.ruoyi - ruoyi-common-swagger + com.intc + intc-common-swagger ws.schild diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/IntcInvestApplication.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/IntcInvestApplication.java similarity index 77% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/IntcInvestApplication.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/IntcInvestApplication.java index 06044be..89edcac 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/IntcInvestApplication.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/IntcInvestApplication.java @@ -1,10 +1,10 @@ -package com.ruoyi; +package com.intc; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import com.ruoyi.common.security.annotation.EnableCustomConfig; -import com.ruoyi.common.security.annotation.EnableRyFeignClients; -import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; +import com.intc.common.security.annotation.EnableCustomConfig; +import com.intc.common.security.annotation.EnableRyFeignClients; +import com.intc.common.swagger.annotation.EnableCustomSwagger2; import java.time.ZoneOffset; import java.util.TimeZone; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/config/ActuatorSecurityConfig.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/config/ActuatorSecurityConfig.java similarity index 94% rename from ruoyi-modules/intc-health/src/main/java/com/ruoyi/config/ActuatorSecurityConfig.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/config/ActuatorSecurityConfig.java index 05433e1..04d6411 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/config/ActuatorSecurityConfig.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/config/ActuatorSecurityConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.config; +package com.intc.config; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/config/ThreadPoolConfig.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/config/ThreadPoolConfig.java similarity index 96% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/config/ThreadPoolConfig.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/config/ThreadPoolConfig.java index ecba066..907b0c7 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/config/ThreadPoolConfig.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/config/ThreadPoolConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.config; +package com.intc.config; -import com.ruoyi.common.core.manager.Threads; +import com.intc.common.core.manager.Threads; import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/constant/LightConstant.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/constant/LightConstant.java similarity index 94% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/constant/LightConstant.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/constant/LightConstant.java index 2b5ae3e..f7cd451 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/constant/LightConstant.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/constant/LightConstant.java @@ -1,4 +1,4 @@ -package com.ruoyi.constant; +package com.intc.constant; /** * @author 22077662 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/api/PushPlusApi.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/api/PushPlusApi.java similarity index 89% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/api/PushPlusApi.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/api/PushPlusApi.java index b6857a2..02aa5bc 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/api/PushPlusApi.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/api/PushPlusApi.java @@ -1,11 +1,11 @@ -package com.ruoyi.invest.api; +package com.intc.invest.api; import cn.hutool.http.HttpUtil; -import com.ruoyi.common.core.manager.AsyncManager; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.invest.domain.ILog; -import com.ruoyi.invest.domain.IUser; +import com.intc.common.core.manager.AsyncManager; +import com.intc.common.core.utils.StringUtils; +import com.intc.invest.domain.ILog; +import com.intc.invest.domain.IUser; import java.util.HashMap; import java.util.Map; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/AccountsController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/AccountsController.java similarity index 84% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/AccountsController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/AccountsController.java index ba40326..7eb03c7 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/AccountsController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/AccountsController.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.invest.domain.Accounts; -import com.ruoyi.invest.domain.vo.AccountsVo; -import com.ruoyi.invest.domain.dto.AccountsDto; -import com.ruoyi.invest.service.IAccountsService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.invest.domain.Accounts; +import com.intc.invest.domain.vo.AccountsVo; +import com.intc.invest.domain.dto.AccountsDto; +import com.intc.invest.service.IAccountsService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 记账账户Controller diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/AccountsDealRecordController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/AccountsDealRecordController.java similarity index 84% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/AccountsDealRecordController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/AccountsDealRecordController.java index b10e046..35af640 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/AccountsDealRecordController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/AccountsDealRecordController.java @@ -1,16 +1,16 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.invest.domain.AccountsDealRecord; -import com.ruoyi.invest.domain.dto.AccountsDealRecordDto; -import com.ruoyi.invest.domain.vo.AccountsDealRecordVo; -import com.ruoyi.invest.service.IAccountsDealRecordService; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.invest.domain.AccountsDealRecord; +import com.intc.invest.domain.dto.AccountsDealRecordDto; +import com.intc.invest.domain.vo.AccountsDealRecordVo; +import com.intc.invest.service.IAccountsDealRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/AccountsTransferRecordController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/AccountsTransferRecordController.java similarity index 84% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/AccountsTransferRecordController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/AccountsTransferRecordController.java index 2b1e1f3..01cb4f9 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/AccountsTransferRecordController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/AccountsTransferRecordController.java @@ -1,16 +1,16 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.invest.domain.AccountsTransferRecord; -import com.ruoyi.invest.domain.dto.AccountsTransferRecordDto; -import com.ruoyi.invest.domain.vo.AccountsTransferRecordVo; -import com.ruoyi.invest.service.IAccountsTransferRecordService; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.invest.domain.AccountsTransferRecord; +import com.intc.invest.domain.dto.AccountsTransferRecordDto; +import com.intc.invest.domain.vo.AccountsTransferRecordVo; +import com.intc.invest.service.IAccountsTransferRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/BankCardLendController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/BankCardLendController.java similarity index 83% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/BankCardLendController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/BankCardLendController.java index 7e83e7f..45fd362 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/BankCardLendController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/BankCardLendController.java @@ -1,16 +1,16 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.invest.domain.BankCardLend; -import com.ruoyi.invest.domain.dto.BankCardLendDto; -import com.ruoyi.invest.domain.vo.BankCardLendVo; -import com.ruoyi.invest.service.IBankCardLendService; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.invest.domain.BankCardLend; +import com.intc.invest.domain.dto.BankCardLendDto; +import com.intc.invest.domain.vo.BankCardLendVo; +import com.intc.invest.service.IBankCardLendService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/BankCardLimitHistoryController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/BankCardLimitHistoryController.java similarity index 85% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/BankCardLimitHistoryController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/BankCardLimitHistoryController.java index e0c6aba..14f8159 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/BankCardLimitHistoryController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/BankCardLimitHistoryController.java @@ -1,16 +1,16 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.invest.domain.BankCardLimitHistory; -import com.ruoyi.invest.domain.dto.BankCardLimitHistoryDto; -import com.ruoyi.invest.domain.vo.BankCardLimitHistoryVo; -import com.ruoyi.invest.service.IBankCardLimitHistoryService; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.invest.domain.BankCardLimitHistory; +import com.intc.invest.domain.dto.BankCardLimitHistoryDto; +import com.intc.invest.domain.vo.BankCardLimitHistoryVo; +import com.intc.invest.service.IBankCardLimitHistoryService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/CreditCardBillController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/CreditCardBillController.java similarity index 85% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/CreditCardBillController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/CreditCardBillController.java index 1d5a299..7a1e871 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/CreditCardBillController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/CreditCardBillController.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.invest.domain.CreditCardBill; -import com.ruoyi.invest.domain.vo.CreditCardBillVo; -import com.ruoyi.invest.domain.dto.CreditCardBillDto; -import com.ruoyi.invest.service.ICreditCardBillService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.invest.domain.CreditCardBill; +import com.intc.invest.domain.vo.CreditCardBillVo; +import com.intc.invest.domain.dto.CreditCardBillDto; +import com.intc.invest.service.ICreditCardBillService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 信用卡账单Controller diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/CreditReportQueryRecordController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/CreditReportQueryRecordController.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/CreditReportQueryRecordController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/CreditReportQueryRecordController.java index a11285d..e818b75 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/CreditReportQueryRecordController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/CreditReportQueryRecordController.java @@ -1,16 +1,16 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.invest.domain.CreditReportQueryRecord; -import com.ruoyi.invest.domain.dto.CreditReportQueryRecordDto; -import com.ruoyi.invest.domain.vo.CreditReportQueryRecordVo; -import com.ruoyi.invest.service.ICreditReportQueryRecordService; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.invest.domain.CreditReportQueryRecord; +import com.intc.invest.domain.dto.CreditReportQueryRecordDto; +import com.intc.invest.domain.vo.CreditReportQueryRecordVo; +import com.intc.invest.service.ICreditReportQueryRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/DebitInforsController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/DebitInforsController.java similarity index 85% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/DebitInforsController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/DebitInforsController.java index 524eb1e..20c9f8a 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/DebitInforsController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/DebitInforsController.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.invest.domain.DebitInfors; -import com.ruoyi.invest.domain.vo.DebitInforsVo; -import com.ruoyi.invest.domain.dto.DebitInforsDto; -import com.ruoyi.invest.service.IDebitInforsService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.invest.domain.DebitInfors; +import com.intc.invest.domain.vo.DebitInforsVo; +import com.intc.invest.domain.dto.DebitInforsDto; +import com.intc.invest.service.IDebitInforsService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 信贷产品管理Controller diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/FutureStocksBillController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/FutureStocksBillController.java similarity index 85% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/FutureStocksBillController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/FutureStocksBillController.java index 72e6d87..9ef2c92 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/FutureStocksBillController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/FutureStocksBillController.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.invest.domain.FutureStocksBill; -import com.ruoyi.invest.domain.vo.FutureStocksBillVo; -import com.ruoyi.invest.domain.dto.FutureStocksBillDto; -import com.ruoyi.invest.service.IFutureStocksBillService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.invest.domain.FutureStocksBill; +import com.intc.invest.domain.vo.FutureStocksBillVo; +import com.intc.invest.domain.dto.FutureStocksBillDto; +import com.intc.invest.service.IFutureStocksBillService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 期货股票账单Controller diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/FutureStocksController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/FutureStocksController.java similarity index 85% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/FutureStocksController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/FutureStocksController.java index 0d24008..4cb6698 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/FutureStocksController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/FutureStocksController.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.invest.domain.FutureStocks; -import com.ruoyi.invest.domain.vo.FutureStocksVo; -import com.ruoyi.invest.domain.dto.FutureStocksDto; -import com.ruoyi.invest.service.IFutureStocksService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.invest.domain.FutureStocks; +import com.intc.invest.domain.vo.FutureStocksVo; +import com.intc.invest.domain.dto.FutureStocksDto; +import com.intc.invest.service.IFutureStocksService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 期货股票基本信息Controller diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/HeartJourneyController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/HeartJourneyController.java similarity index 85% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/HeartJourneyController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/HeartJourneyController.java index c89eebf..f7ffb71 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/HeartJourneyController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/HeartJourneyController.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.invest.domain.HeartJourney; -import com.ruoyi.invest.domain.vo.HeartJourneyVo; -import com.ruoyi.invest.domain.dto.HeartJourneyDto; -import com.ruoyi.invest.service.IHeartJourneyService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.invest.domain.HeartJourney; +import com.intc.invest.domain.vo.HeartJourneyVo; +import com.intc.invest.domain.dto.HeartJourneyDto; +import com.intc.invest.service.IHeartJourneyService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 心路历程Controller diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IItemController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IItemController.java similarity index 74% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IItemController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IItemController.java index 86eb79d..8577f13 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IItemController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IItemController.java @@ -1,14 +1,14 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.invest.domain.dto.IItemDto; -import com.ruoyi.invest.domain.vo.IItemVo; -import com.ruoyi.invest.service.IIItemService; -import com.ruoyi.invest.service.IShopService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.invest.domain.dto.IItemDto; +import com.intc.invest.domain.vo.IItemVo; +import com.intc.invest.service.IIItemService; +import com.intc.invest.service.IShopService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/ILogController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/ILogController.java similarity index 74% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/ILogController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/ILogController.java index ee763ae..77ed739 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/ILogController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/ILogController.java @@ -1,15 +1,15 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.invest.domain.dto.ILogDto; -import com.ruoyi.invest.domain.vo.ILogVo; -import com.ruoyi.invest.service.IMTLogService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.invest.domain.dto.ILogDto; +import com.intc.invest.domain.vo.ILogVo; +import com.intc.invest.service.IMTLogService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IShopController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IShopController.java similarity index 81% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IShopController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IShopController.java index 546cc51..4c7e8bc 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IShopController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IShopController.java @@ -1,16 +1,16 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.invest.domain.dto.IShopDto; -import com.ruoyi.invest.domain.vo.ICityVo; -import com.ruoyi.invest.domain.vo.IDistrictVo; -import com.ruoyi.invest.domain.vo.IProvinceVo; -import com.ruoyi.invest.domain.vo.IShopVo; -import com.ruoyi.invest.service.IShopService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.invest.domain.dto.IShopDto; +import com.intc.invest.domain.vo.ICityVo; +import com.intc.invest.domain.vo.IDistrictVo; +import com.intc.invest.domain.vo.IProvinceVo; +import com.intc.invest.domain.vo.IShopVo; +import com.intc.invest.service.IShopService; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IUserController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IUserController.java similarity index 84% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IUserController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IUserController.java index 5b9cee6..1154280 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IUserController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/IUserController.java @@ -1,25 +1,25 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.invest.domain.IShop; -import com.ruoyi.invest.domain.IUser; -import com.ruoyi.invest.domain.dto.IUserDto; -import com.ruoyi.invest.domain.vo.IItemVo; -import com.ruoyi.invest.domain.vo.IUserVo; -import com.ruoyi.invest.mapper.IItemMapper; -import com.ruoyi.invest.mapper.IUserMapper; -import com.ruoyi.invest.service.IMTService; -import com.ruoyi.invest.service.IShopService; -import com.ruoyi.invest.service.IUserService; +import com.intc.common.core.domain.R; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.invest.domain.IShop; +import com.intc.invest.domain.IUser; +import com.intc.invest.domain.dto.IUserDto; +import com.intc.invest.domain.vo.IItemVo; +import com.intc.invest.domain.vo.IUserVo; +import com.intc.invest.mapper.IItemMapper; +import com.intc.invest.mapper.IUserMapper; +import com.intc.invest.service.IMTService; +import com.intc.invest.service.IShopService; +import com.intc.invest.service.IUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/InstallmentHistoryController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/InstallmentHistoryController.java similarity index 86% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/InstallmentHistoryController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/InstallmentHistoryController.java index 0d27327..3c50196 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/InstallmentHistoryController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/InstallmentHistoryController.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.invest.domain.InstallmentHistory; -import com.ruoyi.invest.domain.vo.InstallmentHistoryVo; -import com.ruoyi.invest.domain.dto.InstallmentHistoryDto; -import com.ruoyi.invest.service.IInstallmentHistoryService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.invest.domain.InstallmentHistory; +import com.intc.invest.domain.vo.InstallmentHistoryVo; +import com.intc.invest.domain.dto.InstallmentHistoryDto; +import com.intc.invest.service.IInstallmentHistoryService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * 网贷及分期历史Controller diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/InstallmentHistoryDetailController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/InstallmentHistoryDetailController.java similarity index 84% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/InstallmentHistoryDetailController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/InstallmentHistoryDetailController.java index ea58bcf..c416ba9 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/InstallmentHistoryDetailController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/InstallmentHistoryDetailController.java @@ -1,16 +1,16 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.invest.domain.InstallmentHistoryDetail; -import com.ruoyi.invest.domain.dto.InstallmentHistoryDetailDto; -import com.ruoyi.invest.domain.vo.InstallmentHistoryDetailVo; -import com.ruoyi.invest.service.IInstallmentHistoryDetailService; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.invest.domain.InstallmentHistoryDetail; +import com.intc.invest.domain.dto.InstallmentHistoryDetailDto; +import com.intc.invest.domain.vo.InstallmentHistoryDetailVo; +import com.intc.invest.service.IInstallmentHistoryDetailService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/PosMachineController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/PosMachineController.java similarity index 85% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/PosMachineController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/PosMachineController.java index 0510010..c230722 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/PosMachineController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/PosMachineController.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; import java.util.List; import java.io.IOException; @@ -12,19 +12,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.invest.domain.PosMachine; -import com.ruoyi.invest.domain.vo.PosMachineVo; -import com.ruoyi.invest.domain.dto.PosMachineDto; -import com.ruoyi.invest.service.IPosMachineService; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.invest.domain.PosMachine; +import com.intc.invest.domain.vo.PosMachineVo; +import com.intc.invest.domain.dto.PosMachineDto; +import com.intc.invest.service.IPosMachineService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.ruoyi.common.core.web.page.TableDataInfo; +import com.intc.common.core.web.page.TableDataInfo; /** * pos机信息Controller diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/StatisticAnalysisController.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/StatisticAnalysisController.java similarity index 95% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/StatisticAnalysisController.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/StatisticAnalysisController.java index 244c3c7..1cc8db5 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/StatisticAnalysisController.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/controller/StatisticAnalysisController.java @@ -1,10 +1,10 @@ -package com.ruoyi.invest.controller; +package com.intc.invest.controller; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.invest.domain.dto.AnalysisDto; -import com.ruoyi.invest.domain.vo.AccountCalendarVo; -import com.ruoyi.invest.service.IStatisticAnalysisService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.invest.domain.dto.AnalysisDto; +import com.intc.invest.domain.vo.AccountCalendarVo; +import com.intc.invest.service.IStatisticAnalysisService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/Accounts.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/Accounts.java similarity index 95% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/Accounts.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/Accounts.java index cd86281..d23e4c0 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/Accounts.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/Accounts.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; 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.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/AccountsDealRecord.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/AccountsDealRecord.java similarity index 95% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/AccountsDealRecord.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/AccountsDealRecord.java index 0d01b72..7621add 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/AccountsDealRecord.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/AccountsDealRecord.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; 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.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/AccountsTransferRecord.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/AccountsTransferRecord.java similarity index 95% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/AccountsTransferRecord.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/AccountsTransferRecord.java index 587f191..c03d462 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/AccountsTransferRecord.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/AccountsTransferRecord.java @@ -1,7 +1,7 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLend.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLend.java similarity index 97% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLend.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLend.java index 6d5f7c7..c968316 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLend.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLend.java @@ -1,8 +1,8 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLimitHistory.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLimitHistory.java similarity index 95% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLimitHistory.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLimitHistory.java index 1407549..12b13b0 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLimitHistory.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/BankCardLimitHistory.java @@ -1,8 +1,8 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/CreditCardBill.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/CreditCardBill.java similarity index 94% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/CreditCardBill.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/CreditCardBill.java index 9ff5d12..8c6516b 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/CreditCardBill.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/CreditCardBill.java @@ -1,8 +1,8 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/CreditReportQueryRecord.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/CreditReportQueryRecord.java similarity index 94% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/CreditReportQueryRecord.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/CreditReportQueryRecord.java index 23b422b..59a8063 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/CreditReportQueryRecord.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/CreditReportQueryRecord.java @@ -1,8 +1,8 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/DebitInfors.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/DebitInfors.java similarity index 96% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/DebitInfors.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/DebitInfors.java index b7d4943..3bb8ae6 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/DebitInfors.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/DebitInfors.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; 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.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocks.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocks.java similarity index 96% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocks.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocks.java index 12493c1..f9f8d44 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocks.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocks.java @@ -1,8 +1,8 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocksBill.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocksBill.java similarity index 95% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocksBill.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocksBill.java index 71857e8..e469324 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocksBill.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/FutureStocksBill.java @@ -1,8 +1,8 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/HeartJourney.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/HeartJourney.java similarity index 91% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/HeartJourney.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/HeartJourney.java index 6a0ea5e..fea4797 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/HeartJourney.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/HeartJourney.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; 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.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IItem.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IItem.java similarity index 94% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IItem.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IItem.java index ef40552..2626e98 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IItem.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IItem.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; import com.alibaba.fastjson2.JSONObject; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/ILog.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/ILog.java similarity index 95% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/ILog.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/ILog.java index 645572d..1f6c3d1 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/ILog.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/ILog.java @@ -1,8 +1,8 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IMTCacheConstants.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IMTCacheConstants.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IMTCacheConstants.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IMTCacheConstants.java index 35cf9b7..c3524ca 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IMTCacheConstants.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IMTCacheConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; /** * i茅台缓存常量 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IMTItemInfo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IMTItemInfo.java similarity index 91% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IMTItemInfo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IMTItemInfo.java index ddd7059..ce355c5 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IMTItemInfo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IMTItemInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IShop.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IShop.java similarity index 96% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IShop.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IShop.java index e1ebc7f..837e9b4 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IShop.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IShop.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; import com.alibaba.fastjson2.JSONObject; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IUser.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IUser.java similarity index 95% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IUser.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IUser.java index 3a9b9bf..88493e4 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IUser.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IUser.java @@ -1,8 +1,8 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IUserRequest.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IUserRequest.java similarity index 98% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IUserRequest.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IUserRequest.java index 01a6cf5..e316757 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IUserRequest.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/IUserRequest.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/InstallmentHistory.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/InstallmentHistory.java similarity index 97% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/InstallmentHistory.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/InstallmentHistory.java index 401cec0..257c00d 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/InstallmentHistory.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/InstallmentHistory.java @@ -1,8 +1,8 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/InstallmentHistoryDetail.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/InstallmentHistoryDetail.java similarity index 96% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/InstallmentHistoryDetail.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/InstallmentHistoryDetail.java index e600bba..1e6ca93 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/InstallmentHistoryDetail.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/InstallmentHistoryDetail.java @@ -1,8 +1,8 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/MapPoint.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/MapPoint.java similarity index 88% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/MapPoint.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/MapPoint.java index abb3034..b69b95c 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/MapPoint.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/MapPoint.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/PosMachine.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/PosMachine.java similarity index 96% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/PosMachine.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/PosMachine.java index 4ee87c9..2dcba6a 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/PosMachine.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/PosMachine.java @@ -1,8 +1,8 @@ -package com.ruoyi.invest.domain; +package com.intc.invest.domain; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDealRecordDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDealRecordDto.java similarity index 94% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDealRecordDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDealRecordDto.java index 05b5c1e..0247adb 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDealRecordDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDealRecordDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDto.java similarity index 93% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDto.java index 064c201..aa249c4 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsTransferRecordDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsTransferRecordDto.java similarity index 93% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsTransferRecordDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsTransferRecordDto.java index 6a1bc8f..fa348c1 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsTransferRecordDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AccountsTransferRecordDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AnalysisDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AnalysisDto.java similarity index 92% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AnalysisDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AnalysisDto.java index d0101fc..ed780be 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AnalysisDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/AnalysisDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java similarity index 93% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java index a60d58a..fa514d7 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLendDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLimitHistoryDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLimitHistoryDto.java similarity index 97% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLimitHistoryDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLimitHistoryDto.java index 742e70a..daff717 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLimitHistoryDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/BankCardLimitHistoryDto.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/CreditCardBillDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/CreditCardBillDto.java similarity index 91% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/CreditCardBillDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/CreditCardBillDto.java index d90cab0..1acadb9 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/CreditCardBillDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/CreditCardBillDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/CreditReportQueryRecordDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/CreditReportQueryRecordDto.java similarity index 91% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/CreditReportQueryRecordDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/CreditReportQueryRecordDto.java index 82d2fa5..fd3f0d3 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/CreditReportQueryRecordDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/CreditReportQueryRecordDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/DebitInforsDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/DebitInforsDto.java similarity index 88% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/DebitInforsDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/DebitInforsDto.java index f14caa9..058b0ba 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/DebitInforsDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/DebitInforsDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksBillDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksBillDto.java similarity index 94% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksBillDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksBillDto.java index 2b75015..caf58a8 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksBillDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksBillDto.java @@ -1,7 +1,7 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksDto.java similarity index 89% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksDto.java index 5889dbb..6cdbc94 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/FutureStocksDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/HeartJourneyDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/HeartJourneyDto.java similarity index 86% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/HeartJourneyDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/HeartJourneyDto.java index a58f9ef..c2549b8 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/HeartJourneyDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/HeartJourneyDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IItemDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IItemDto.java similarity index 94% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IItemDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IItemDto.java index e806732..d8114b0 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IItemDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IItemDto.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; import lombok.Data; import java.io.Serializable; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/ILogDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/ILogDto.java similarity index 91% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/ILogDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/ILogDto.java index 589e777..ba6b294 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/ILogDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/ILogDto.java @@ -1,7 +1,7 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IShopDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IShopDto.java similarity index 97% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IShopDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IShopDto.java index 1312d79..3a9f7ac 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IShopDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IShopDto.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IUserDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IUserDto.java similarity index 96% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IUserDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IUserDto.java index 1f908ea..35325b8 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IUserDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/IUserDto.java @@ -1,7 +1,7 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/InstallmentHistoryDetailDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/InstallmentHistoryDetailDto.java similarity index 94% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/InstallmentHistoryDetailDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/InstallmentHistoryDetailDto.java index 31f3763..ae436ab 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/InstallmentHistoryDetailDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/InstallmentHistoryDetailDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/InstallmentHistoryDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/InstallmentHistoryDto.java similarity index 92% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/InstallmentHistoryDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/InstallmentHistoryDto.java index c39fb38..015acbe 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/InstallmentHistoryDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/InstallmentHistoryDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/PosMachineDto.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/PosMachineDto.java similarity index 89% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/PosMachineDto.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/PosMachineDto.java index d851e4d..c7836aa 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/PosMachineDto.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/dto/PosMachineDto.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.dto; +package com.intc.invest.domain.dto; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountCalendarVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountCalendarVo.java similarity index 92% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountCalendarVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountCalendarVo.java index 4085aa6..a6469df 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountCalendarVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountCalendarVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; import io.swagger.annotations.ApiModel; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsDealRecordVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsDealRecordVo.java similarity index 84% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsDealRecordVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsDealRecordVo.java index 422fe95..3e1d312 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsDealRecordVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsDealRecordVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; -import com.ruoyi.invest.domain.AccountsDealRecord; +import com.intc.invest.domain.AccountsDealRecord; import io.swagger.annotations.ApiModel; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsTransferRecordVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsTransferRecordVo.java similarity index 88% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsTransferRecordVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsTransferRecordVo.java index dc97cea..0f17701 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsTransferRecordVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsTransferRecordVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; -import com.ruoyi.invest.domain.AccountsTransferRecord; +import com.intc.invest.domain.AccountsTransferRecord; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsVo.java similarity index 93% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsVo.java index ee3cf1c..5e2c348 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/AccountsVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; -import com.ruoyi.invest.domain.Accounts; +import com.intc.invest.domain.Accounts; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/BankCardLendVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/BankCardLendVo.java similarity index 86% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/BankCardLendVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/BankCardLendVo.java index 38db56b..f752df0 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/BankCardLendVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/BankCardLendVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; -import com.ruoyi.invest.domain.BankCardLend; +import com.intc.invest.domain.BankCardLend; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/BankCardLimitHistoryVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/BankCardLimitHistoryVo.java similarity index 77% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/BankCardLimitHistoryVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/BankCardLimitHistoryVo.java index ad810d7..213c71e 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/BankCardLimitHistoryVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/BankCardLimitHistoryVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; -import com.ruoyi.invest.domain.BankCardLimitHistory; +import com.intc.invest.domain.BankCardLimitHistory; import lombok.Data; import io.swagger.annotations.ApiModel; /** diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditCardBillVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditCardBillVo.java similarity index 83% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditCardBillVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditCardBillVo.java index 4c52f82..5f16257 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditCardBillVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditCardBillVo.java @@ -1,7 +1,7 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.invest.domain.CreditCardBill; +import com.intc.common.core.annotation.Excel; +import com.intc.invest.domain.CreditCardBill; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditReportAnalysisVO.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditReportAnalysisVO.java similarity index 97% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditReportAnalysisVO.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditReportAnalysisVO.java index 497539a..49896b9 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditReportAnalysisVO.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditReportAnalysisVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditReportQueryRecordVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditReportQueryRecordVo.java similarity index 76% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditReportQueryRecordVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditReportQueryRecordVo.java index 60b085c..e2fc5e4 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditReportQueryRecordVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/CreditReportQueryRecordVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; -import com.ruoyi.invest.domain.CreditReportQueryRecord; +import com.intc.invest.domain.CreditReportQueryRecord; import lombok.Data; import io.swagger.annotations.ApiModel; /** diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/DebitInforsVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/DebitInforsVo.java similarity index 76% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/DebitInforsVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/DebitInforsVo.java index d3ef747..80a9920 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/DebitInforsVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/DebitInforsVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; -import com.ruoyi.invest.domain.DebitInfors; +import com.intc.invest.domain.DebitInfors; import lombok.Data; import io.swagger.annotations.ApiModel; /** diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/FutureStocksBillVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/FutureStocksBillVo.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/FutureStocksBillVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/FutureStocksBillVo.java index 44f0d6c..a68b715 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/FutureStocksBillVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/FutureStocksBillVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; -import com.ruoyi.invest.domain.FutureStocksBill; +import com.intc.invest.domain.FutureStocksBill; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/FutureStocksVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/FutureStocksVo.java similarity index 90% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/FutureStocksVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/FutureStocksVo.java index 3c6effc..70092c3 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/FutureStocksVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/FutureStocksVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; -import com.ruoyi.invest.domain.FutureStocks; +import com.intc.invest.domain.FutureStocks; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/HeartJourneyVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/HeartJourneyVo.java similarity index 75% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/HeartJourneyVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/HeartJourneyVo.java index a5e4f39..1b6a3c6 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/HeartJourneyVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/HeartJourneyVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; -import com.ruoyi.invest.domain.HeartJourney; +import com.intc.invest.domain.HeartJourney; import lombok.Data; import io.swagger.annotations.ApiModel; /** diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/ICityVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/ICityVo.java similarity index 88% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/ICityVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/ICityVo.java index b89c270..e2cf8e2 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/ICityVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/ICityVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; import io.swagger.annotations.ApiModel; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IDistrictVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IDistrictVo.java similarity index 88% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IDistrictVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IDistrictVo.java index 0a77795..fde9c39 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IDistrictVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IDistrictVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; import io.swagger.annotations.ApiModel; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IItemVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IItemVo.java similarity index 77% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IItemVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IItemVo.java index 48136ec..bcaf661 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IItemVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IItemVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; -import com.ruoyi.invest.domain.IItem; +import com.intc.invest.domain.IItem; import lombok.Data; import io.swagger.annotations.ApiModel; /** diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/ILogVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/ILogVo.java similarity index 75% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/ILogVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/ILogVo.java index 33b91e0..b818e33 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/ILogVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/ILogVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; -import com.ruoyi.invest.domain.ILog; +import com.intc.invest.domain.ILog; import lombok.Data; import io.swagger.annotations.ApiModel; /** diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IProvinceVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IProvinceVo.java similarity index 88% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IProvinceVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IProvinceVo.java index ab587a5..909b1b0 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IProvinceVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IProvinceVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; import io.swagger.annotations.ApiModel; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IShopVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IShopVo.java similarity index 75% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IShopVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IShopVo.java index 6ba5fb2..28c42c0 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IShopVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IShopVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; -import com.ruoyi.invest.domain.IShop; +import com.intc.invest.domain.IShop; import lombok.Data; import io.swagger.annotations.ApiModel; /** diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IUserVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IUserVo.java similarity index 77% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IUserVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IUserVo.java index ba21905..6b8d299 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IUserVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/IUserVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; -import com.ruoyi.invest.domain.IUser; +import com.intc.invest.domain.IUser; import lombok.Data; import io.swagger.annotations.ApiModel; /** diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryDetailVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryDetailVo.java similarity index 78% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryDetailVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryDetailVo.java index afbc977..65e9632 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryDetailVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryDetailVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; -import com.ruoyi.invest.domain.InstallmentHistoryDetail; +import com.intc.invest.domain.InstallmentHistoryDetail; import io.swagger.annotations.ApiModel; import lombok.Data; /** diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryVo.java similarity index 92% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryVo.java index b6f2bb5..f8ec5ba 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/InstallmentHistoryVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; -import com.ruoyi.invest.domain.InstallmentHistory; +import com.intc.invest.domain.InstallmentHistory; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/PosMachineVo.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/PosMachineVo.java similarity index 90% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/PosMachineVo.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/PosMachineVo.java index d560cf3..2285cdd 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/PosMachineVo.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/domain/vo/PosMachineVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.invest.domain.vo; +package com.intc.invest.domain.vo; -import com.ruoyi.invest.domain.PosMachine; +import com.intc.invest.domain.PosMachine; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsDealRecordMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsDealRecordMapper.java similarity index 91% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsDealRecordMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsDealRecordMapper.java index ba5d3f6..e749c6f 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsDealRecordMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsDealRecordMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.invest.domain.AccountsDealRecord; -import com.ruoyi.invest.domain.dto.AccountsDealRecordDto; -import com.ruoyi.invest.domain.vo.AccountsDealRecordVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.invest.domain.AccountsDealRecord; +import com.intc.invest.domain.dto.AccountsDealRecordDto; +import com.intc.invest.domain.vo.AccountsDealRecordVo; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsMapper.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsMapper.java index 55ce78f..62b216c 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.invest.domain.Accounts; -import com.ruoyi.invest.domain.dto.AccountsDto; -import com.ruoyi.invest.domain.vo.AccountsVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.invest.domain.Accounts; +import com.intc.invest.domain.dto.AccountsDto; +import com.intc.invest.domain.vo.AccountsVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsTransferRecordMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsTransferRecordMapper.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsTransferRecordMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsTransferRecordMapper.java index d3fcae3..b8f99b9 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsTransferRecordMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/AccountsTransferRecordMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.invest.domain.AccountsTransferRecord; -import com.ruoyi.invest.domain.dto.AccountsTransferRecordDto; -import com.ruoyi.invest.domain.vo.AccountsTransferRecordVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.invest.domain.AccountsTransferRecord; +import com.intc.invest.domain.dto.AccountsTransferRecordDto; +import com.intc.invest.domain.vo.AccountsTransferRecordVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/BankCardLendMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/BankCardLendMapper.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/BankCardLendMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/BankCardLendMapper.java index 4c0be30..e76aa7e 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/BankCardLendMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/BankCardLendMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.invest.domain.BankCardLend; -import com.ruoyi.invest.domain.dto.BankCardLendDto; -import com.ruoyi.invest.domain.vo.BankCardLendVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.invest.domain.BankCardLend; +import com.intc.invest.domain.dto.BankCardLendDto; +import com.intc.invest.domain.vo.BankCardLendVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/BankCardLimitHistoryMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/BankCardLimitHistoryMapper.java similarity index 91% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/BankCardLimitHistoryMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/BankCardLimitHistoryMapper.java index 0627636..5d0c7a0 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/BankCardLimitHistoryMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/BankCardLimitHistoryMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; import java.util.List; -import com.ruoyi.invest.domain.BankCardLimitHistory; -import com.ruoyi.invest.domain.dto.BankCardLimitHistoryDto; -import com.ruoyi.invest.domain.vo.BankCardLimitHistoryVo; +import com.intc.invest.domain.BankCardLimitHistory; +import com.intc.invest.domain.dto.BankCardLimitHistoryDto; +import com.intc.invest.domain.vo.BankCardLimitHistoryVo; /** * 银行卡额度调整历史记录Mapper接口 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/CreditCardBillMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/CreditCardBillMapper.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/CreditCardBillMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/CreditCardBillMapper.java index f0a9609..1e2873c 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/CreditCardBillMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/CreditCardBillMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.invest.domain.CreditCardBill; -import com.ruoyi.invest.domain.dto.CreditCardBillDto; -import com.ruoyi.invest.domain.vo.CreditCardBillVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.invest.domain.CreditCardBill; +import com.intc.invest.domain.dto.CreditCardBillDto; +import com.intc.invest.domain.vo.CreditCardBillVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/CreditReportQueryRecordMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/CreditReportQueryRecordMapper.java similarity index 89% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/CreditReportQueryRecordMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/CreditReportQueryRecordMapper.java index bb27741..4178b07 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/CreditReportQueryRecordMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/CreditReportQueryRecordMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.invest.domain.CreditReportQueryRecord; -import com.ruoyi.invest.domain.dto.CreditReportQueryRecordDto; -import com.ruoyi.invest.domain.vo.CreditReportQueryRecordVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.invest.domain.CreditReportQueryRecord; +import com.intc.invest.domain.dto.CreditReportQueryRecordDto; +import com.intc.invest.domain.vo.CreditReportQueryRecordVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/DebitInforsMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/DebitInforsMapper.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/DebitInforsMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/DebitInforsMapper.java index 5894e75..1416e85 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/DebitInforsMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/DebitInforsMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.invest.domain.DebitInfors; -import com.ruoyi.invest.domain.dto.DebitInforsDto; -import com.ruoyi.invest.domain.vo.DebitInforsVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.invest.domain.DebitInfors; +import com.intc.invest.domain.dto.DebitInforsDto; +import com.intc.invest.domain.vo.DebitInforsVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/FutureStocksBillMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/FutureStocksBillMapper.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/FutureStocksBillMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/FutureStocksBillMapper.java index 4d071fe..d524dae 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/FutureStocksBillMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/FutureStocksBillMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.invest.domain.FutureStocksBill; -import com.ruoyi.invest.domain.dto.FutureStocksBillDto; -import com.ruoyi.invest.domain.vo.FutureStocksBillVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.invest.domain.FutureStocksBill; +import com.intc.invest.domain.dto.FutureStocksBillDto; +import com.intc.invest.domain.vo.FutureStocksBillVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/FutureStocksMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/FutureStocksMapper.java similarity index 88% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/FutureStocksMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/FutureStocksMapper.java index 28ce333..4a19bbe 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/FutureStocksMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/FutureStocksMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.invest.domain.FutureStocks; -import com.ruoyi.invest.domain.dto.FutureStocksDto; -import com.ruoyi.invest.domain.vo.FutureStocksVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.invest.domain.FutureStocks; +import com.intc.invest.domain.dto.FutureStocksDto; +import com.intc.invest.domain.vo.FutureStocksVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/HeartJourneyMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/HeartJourneyMapper.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/HeartJourneyMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/HeartJourneyMapper.java index db00ded..a32ee01 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/HeartJourneyMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/HeartJourneyMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.invest.domain.HeartJourney; -import com.ruoyi.invest.domain.dto.HeartJourneyDto; -import com.ruoyi.invest.domain.vo.HeartJourneyVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.invest.domain.HeartJourney; +import com.intc.invest.domain.dto.HeartJourneyDto; +import com.intc.invest.domain.vo.HeartJourneyVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IItemMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IItemMapper.java similarity index 91% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IItemMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IItemMapper.java index ad48e63..23c0334 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IItemMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IItemMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; -import com.ruoyi.invest.domain.IItem; -import com.ruoyi.invest.domain.dto.IItemDto; -import com.ruoyi.invest.domain.vo.IItemVo; +import com.intc.invest.domain.IItem; +import com.intc.invest.domain.dto.IItemDto; +import com.intc.invest.domain.vo.IItemVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/ILogMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/ILogMapper.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/ILogMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/ILogMapper.java index 9addc1f..d405d4b 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/ILogMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/ILogMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.invest.domain.ILog; -import com.ruoyi.invest.domain.dto.ILogDto; -import com.ruoyi.invest.domain.vo.ILogVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.invest.domain.ILog; +import com.intc.invest.domain.dto.ILogDto; +import com.intc.invest.domain.vo.ILogVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IShopMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IShopMapper.java similarity index 89% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IShopMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IShopMapper.java index 3939f56..47b9c50 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IShopMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IShopMapper.java @@ -1,11 +1,11 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; -import com.ruoyi.invest.domain.IShop; -import com.ruoyi.invest.domain.dto.IShopDto; -import com.ruoyi.invest.domain.vo.ICityVo; -import com.ruoyi.invest.domain.vo.IDistrictVo; -import com.ruoyi.invest.domain.vo.IProvinceVo; -import com.ruoyi.invest.domain.vo.IShopVo; +import com.intc.invest.domain.IShop; +import com.intc.invest.domain.dto.IShopDto; +import com.intc.invest.domain.vo.ICityVo; +import com.intc.invest.domain.vo.IDistrictVo; +import com.intc.invest.domain.vo.IProvinceVo; +import com.intc.invest.domain.vo.IShopVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IUserMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IUserMapper.java similarity index 90% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IUserMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IUserMapper.java index 17c4ba7..bbf58a1 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IUserMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/IUserMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.invest.domain.IUser; -import com.ruoyi.invest.domain.dto.IUserDto; -import com.ruoyi.invest.domain.vo.IUserVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.invest.domain.IUser; +import com.intc.invest.domain.dto.IUserDto; +import com.intc.invest.domain.vo.IUserVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/InstallmentHistoryDetailMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/InstallmentHistoryDetailMapper.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/InstallmentHistoryDetailMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/InstallmentHistoryDetailMapper.java index 6eb9e84..d412916 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/InstallmentHistoryDetailMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/InstallmentHistoryDetailMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.invest.domain.InstallmentHistoryDetail; -import com.ruoyi.invest.domain.dto.InstallmentHistoryDetailDto; -import com.ruoyi.invest.domain.vo.InstallmentHistoryDetailVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.invest.domain.InstallmentHistoryDetail; +import com.intc.invest.domain.dto.InstallmentHistoryDetailDto; +import com.intc.invest.domain.vo.InstallmentHistoryDetailVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/InstallmentHistoryMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/InstallmentHistoryMapper.java similarity index 89% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/InstallmentHistoryMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/InstallmentHistoryMapper.java index 3742625..0ce4d8b 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/InstallmentHistoryMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/InstallmentHistoryMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.invest.domain.InstallmentHistory; -import com.ruoyi.invest.domain.dto.InstallmentHistoryDto; -import com.ruoyi.invest.domain.vo.InstallmentHistoryVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.invest.domain.InstallmentHistory; +import com.intc.invest.domain.dto.InstallmentHistoryDto; +import com.intc.invest.domain.vo.InstallmentHistoryVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/PosMachineMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/PosMachineMapper.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/PosMachineMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/PosMachineMapper.java index 7bda08c..eec8a69 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/PosMachineMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/PosMachineMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.invest.domain.PosMachine; -import com.ruoyi.invest.domain.dto.PosMachineDto; -import com.ruoyi.invest.domain.vo.PosMachineVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.invest.domain.PosMachine; +import com.intc.invest.domain.dto.PosMachineDto; +import com.intc.invest.domain.vo.PosMachineVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/StatisticAnalysisMapper.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/StatisticAnalysisMapper.java similarity index 82% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/StatisticAnalysisMapper.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/StatisticAnalysisMapper.java index 16153b1..42a203b 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/StatisticAnalysisMapper.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/mapper/StatisticAnalysisMapper.java @@ -1,12 +1,12 @@ -package com.ruoyi.invest.mapper; +package com.intc.invest.mapper; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.invest.domain.dto.AccountsDealRecordDto; -import com.ruoyi.invest.domain.dto.BankCardLendDto; -import com.ruoyi.invest.domain.vo.AccountCalendarVo; -import com.ruoyi.invest.domain.vo.AccountsDealRecordVo; -import com.ruoyi.invest.domain.vo.AccountsVo; -import com.ruoyi.invest.domain.vo.BankCardLendVo; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.invest.domain.dto.AccountsDealRecordDto; +import com.intc.invest.domain.dto.BankCardLendDto; +import com.intc.invest.domain.vo.AccountCalendarVo; +import com.intc.invest.domain.vo.AccountsDealRecordVo; +import com.intc.invest.domain.vo.AccountsVo; +import com.intc.invest.domain.vo.BankCardLendVo; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IAccountsDealRecordService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IAccountsDealRecordService.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IAccountsDealRecordService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IAccountsDealRecordService.java index 87a93b7..e24858f 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IAccountsDealRecordService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IAccountsDealRecordService.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; import java.util.List; -import com.ruoyi.invest.domain.AccountsDealRecord; -import com.ruoyi.invest.domain.dto.AccountsDealRecordDto; -import com.ruoyi.invest.domain.vo.AccountsDealRecordVo; +import com.intc.invest.domain.AccountsDealRecord; +import com.intc.invest.domain.dto.AccountsDealRecordDto; +import com.intc.invest.domain.vo.AccountsDealRecordVo; /** * 账户交易记录Service接口 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IAccountsService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IAccountsService.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IAccountsService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IAccountsService.java index 8642c57..96e0110 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IAccountsService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IAccountsService.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; import java.util.List; -import com.ruoyi.invest.domain.Accounts; -import com.ruoyi.invest.domain.dto.AccountsDto; -import com.ruoyi.invest.domain.vo.AccountsVo; +import com.intc.invest.domain.Accounts; +import com.intc.invest.domain.dto.AccountsDto; +import com.intc.invest.domain.vo.AccountsVo; /** * 记账账户Service接口 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IAccountsTransferRecordService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IAccountsTransferRecordService.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IAccountsTransferRecordService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IAccountsTransferRecordService.java index 7463d98..573f1e8 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IAccountsTransferRecordService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IAccountsTransferRecordService.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; import java.util.List; -import com.ruoyi.invest.domain.AccountsTransferRecord; -import com.ruoyi.invest.domain.dto.AccountsTransferRecordDto; -import com.ruoyi.invest.domain.vo.AccountsTransferRecordVo; +import com.intc.invest.domain.AccountsTransferRecord; +import com.intc.invest.domain.dto.AccountsTransferRecordDto; +import com.intc.invest.domain.vo.AccountsTransferRecordVo; /** * 账户转账记录Service接口 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IBankCardLendService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IBankCardLendService.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IBankCardLendService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IBankCardLendService.java index d9ed778..4dbf3ed 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IBankCardLendService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IBankCardLendService.java @@ -1,8 +1,8 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; -import com.ruoyi.invest.domain.BankCardLend; -import com.ruoyi.invest.domain.dto.BankCardLendDto; -import com.ruoyi.invest.domain.vo.BankCardLendVo; +import com.intc.invest.domain.BankCardLend; +import com.intc.invest.domain.dto.BankCardLendDto; +import com.intc.invest.domain.vo.BankCardLendVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IBankCardLimitHistoryService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IBankCardLimitHistoryService.java similarity index 89% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IBankCardLimitHistoryService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IBankCardLimitHistoryService.java index 82f1711..842ea18 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IBankCardLimitHistoryService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IBankCardLimitHistoryService.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; import java.util.List; -import com.ruoyi.invest.domain.BankCardLimitHistory; -import com.ruoyi.invest.domain.dto.BankCardLimitHistoryDto; -import com.ruoyi.invest.domain.vo.BankCardLimitHistoryVo; +import com.intc.invest.domain.BankCardLimitHistory; +import com.intc.invest.domain.dto.BankCardLimitHistoryDto; +import com.intc.invest.domain.vo.BankCardLimitHistoryVo; /** * 银行卡额度调整历史记录Service接口 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/ICreditCardBillService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/ICreditCardBillService.java similarity index 89% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/ICreditCardBillService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/ICreditCardBillService.java index 9e22471..f972e5f 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/ICreditCardBillService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/ICreditCardBillService.java @@ -1,8 +1,8 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; -import com.ruoyi.invest.domain.CreditCardBill; -import com.ruoyi.invest.domain.dto.CreditCardBillDto; -import com.ruoyi.invest.domain.vo.CreditCardBillVo; +import com.intc.invest.domain.CreditCardBill; +import com.intc.invest.domain.dto.CreditCardBillDto; +import com.intc.invest.domain.vo.CreditCardBillVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/ICreditReportQueryRecordService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/ICreditReportQueryRecordService.java similarity index 88% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/ICreditReportQueryRecordService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/ICreditReportQueryRecordService.java index 06e97b9..e1fc09b 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/ICreditReportQueryRecordService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/ICreditReportQueryRecordService.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; -import com.ruoyi.invest.domain.CreditReportQueryRecord; -import com.ruoyi.invest.domain.dto.CreditReportQueryRecordDto; -import com.ruoyi.invest.domain.vo.CreditReportAnalysisVO; -import com.ruoyi.invest.domain.vo.CreditReportQueryRecordVo; +import com.intc.invest.domain.CreditReportQueryRecord; +import com.intc.invest.domain.dto.CreditReportQueryRecordDto; +import com.intc.invest.domain.vo.CreditReportAnalysisVO; +import com.intc.invest.domain.vo.CreditReportQueryRecordVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IDebitInforsService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IDebitInforsService.java similarity index 88% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IDebitInforsService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IDebitInforsService.java index b883a2a..a83ba6e 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IDebitInforsService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IDebitInforsService.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; import java.util.List; -import com.ruoyi.invest.domain.DebitInfors; -import com.ruoyi.invest.domain.dto.DebitInforsDto; -import com.ruoyi.invest.domain.vo.DebitInforsVo; +import com.intc.invest.domain.DebitInfors; +import com.intc.invest.domain.dto.DebitInforsDto; +import com.intc.invest.domain.vo.DebitInforsVo; /** * 信贷产品管理Service接口 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IFutureStocksBillService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IFutureStocksBillService.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IFutureStocksBillService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IFutureStocksBillService.java index b2446d7..07ea3a9 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IFutureStocksBillService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IFutureStocksBillService.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; import java.util.List; -import com.ruoyi.invest.domain.FutureStocksBill; -import com.ruoyi.invest.domain.dto.FutureStocksBillDto; -import com.ruoyi.invest.domain.vo.FutureStocksBillVo; +import com.intc.invest.domain.FutureStocksBill; +import com.intc.invest.domain.dto.FutureStocksBillDto; +import com.intc.invest.domain.vo.FutureStocksBillVo; /** * 期货股票账单Service接口 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IFutureStocksService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IFutureStocksService.java similarity index 88% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IFutureStocksService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IFutureStocksService.java index 1044d35..bc3c141 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IFutureStocksService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IFutureStocksService.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; import java.util.List; -import com.ruoyi.invest.domain.FutureStocks; -import com.ruoyi.invest.domain.dto.FutureStocksDto; -import com.ruoyi.invest.domain.vo.FutureStocksVo; +import com.intc.invest.domain.FutureStocks; +import com.intc.invest.domain.dto.FutureStocksDto; +import com.intc.invest.domain.vo.FutureStocksVo; /** * 期货股票基本信息Service接口 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IHeartJourneyService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IHeartJourneyService.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IHeartJourneyService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IHeartJourneyService.java index 2ceeb90..c8735d7 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IHeartJourneyService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IHeartJourneyService.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; import java.util.List; -import com.ruoyi.invest.domain.HeartJourney; -import com.ruoyi.invest.domain.dto.HeartJourneyDto; -import com.ruoyi.invest.domain.vo.HeartJourneyVo; +import com.intc.invest.domain.HeartJourney; +import com.intc.invest.domain.dto.HeartJourneyDto; +import com.intc.invest.domain.vo.HeartJourneyVo; /** * 心路历程Service接口 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IIItemService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IIItemService.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IIItemService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IIItemService.java index dfa659e..5d76ac8 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IIItemService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IIItemService.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; import java.util.List; -import com.ruoyi.invest.domain.IItem; -import com.ruoyi.invest.domain.dto.IItemDto; -import com.ruoyi.invest.domain.vo.IItemVo; +import com.intc.invest.domain.IItem; +import com.intc.invest.domain.dto.IItemDto; +import com.intc.invest.domain.vo.IItemVo; /** * 预约项目Service接口 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IInstallmentHistoryDetailService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IInstallmentHistoryDetailService.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IInstallmentHistoryDetailService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IInstallmentHistoryDetailService.java index 0e42f96..5fffa06 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IInstallmentHistoryDetailService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IInstallmentHistoryDetailService.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; import java.util.List; -import com.ruoyi.invest.domain.InstallmentHistoryDetail; -import com.ruoyi.invest.domain.dto.InstallmentHistoryDetailDto; -import com.ruoyi.invest.domain.vo.InstallmentHistoryDetailVo; +import com.intc.invest.domain.InstallmentHistoryDetail; +import com.intc.invest.domain.dto.InstallmentHistoryDetailDto; +import com.intc.invest.domain.vo.InstallmentHistoryDetailVo; /** * 分期历史明细Service接口 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IInstallmentHistoryService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IInstallmentHistoryService.java similarity index 88% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IInstallmentHistoryService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IInstallmentHistoryService.java index ebd0966..3fa2295 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IInstallmentHistoryService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IInstallmentHistoryService.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; import java.util.List; -import com.ruoyi.invest.domain.InstallmentHistory; -import com.ruoyi.invest.domain.dto.InstallmentHistoryDto; -import com.ruoyi.invest.domain.vo.InstallmentHistoryVo; +import com.intc.invest.domain.InstallmentHistory; +import com.intc.invest.domain.dto.InstallmentHistoryDto; +import com.intc.invest.domain.vo.InstallmentHistoryVo; /** * 网贷及分期历史Service接口 diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IMTLogFactory.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IMTLogFactory.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IMTLogFactory.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IMTLogFactory.java index c0da8c5..ad0cbcc 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IMTLogFactory.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IMTLogFactory.java @@ -1,11 +1,11 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; -import com.ruoyi.common.core.manager.AsyncManager; -import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.invest.api.PushPlusApi; -import com.ruoyi.invest.domain.ILog; -import com.ruoyi.invest.domain.IUser; +import com.intc.common.core.manager.AsyncManager; +import com.intc.common.core.utils.SpringUtils; +import com.intc.invest.api.PushPlusApi; +import com.intc.invest.domain.ILog; +import com.intc.invest.domain.IUser; import java.util.Date; import java.util.TimerTask; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IMTLogService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IMTLogService.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IMTLogService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IMTLogService.java index 4fd9058..8765de2 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IMTLogService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IMTLogService.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; -import com.ruoyi.invest.domain.dto.ILogDto; -import com.ruoyi.invest.domain.vo.ILogVo; -import com.ruoyi.invest.domain.ILog; +import com.intc.invest.domain.dto.ILogDto; +import com.intc.invest.domain.vo.ILogVo; +import com.intc.invest.domain.ILog; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IMTService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IMTService.java similarity index 95% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IMTService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IMTService.java index ac15bad..40a8596 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IMTService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IMTService.java @@ -1,7 +1,7 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; -import com.ruoyi.invest.domain.IUser; +import com.intc.invest.domain.IUser; public interface IMTService { /** diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IPosMachineService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IPosMachineService.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IPosMachineService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IPosMachineService.java index a74cf14..ffc7901 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IPosMachineService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IPosMachineService.java @@ -1,8 +1,8 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; -import com.ruoyi.invest.domain.PosMachine; -import com.ruoyi.invest.domain.dto.PosMachineDto; -import com.ruoyi.invest.domain.vo.PosMachineVo; +import com.intc.invest.domain.PosMachine; +import com.intc.invest.domain.dto.PosMachineDto; +import com.intc.invest.domain.vo.PosMachineVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IShopService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IShopService.java similarity index 88% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IShopService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IShopService.java index 128eb51..2cbd9c3 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IShopService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IShopService.java @@ -1,13 +1,13 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; -import com.ruoyi.invest.domain.IMTItemInfo; -import com.ruoyi.invest.domain.IShop; -import com.ruoyi.invest.domain.dto.IShopDto; -import com.ruoyi.invest.domain.vo.ICityVo; -import com.ruoyi.invest.domain.vo.IDistrictVo; -import com.ruoyi.invest.domain.vo.IProvinceVo; -import com.ruoyi.invest.domain.vo.IShopVo; +import com.intc.invest.domain.IMTItemInfo; +import com.intc.invest.domain.IShop; +import com.intc.invest.domain.dto.IShopDto; +import com.intc.invest.domain.vo.ICityVo; +import com.intc.invest.domain.vo.IDistrictVo; +import com.intc.invest.domain.vo.IProvinceVo; +import com.intc.invest.domain.vo.IShopVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IStatisticAnalysisService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IStatisticAnalysisService.java similarity index 87% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IStatisticAnalysisService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IStatisticAnalysisService.java index 8584205..f408b39 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IStatisticAnalysisService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IStatisticAnalysisService.java @@ -1,8 +1,8 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; -import com.ruoyi.invest.domain.dto.AnalysisDto; -import com.ruoyi.invest.domain.vo.AccountCalendarVo; -import com.ruoyi.invest.domain.vo.CreditReportAnalysisVO; +import com.intc.invest.domain.dto.AnalysisDto; +import com.intc.invest.domain.vo.AccountCalendarVo; +import com.intc.invest.domain.vo.CreditReportAnalysisVO; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IUserService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IUserService.java similarity index 89% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IUserService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IUserService.java index df05c17..3eb01f1 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IUserService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/IUserService.java @@ -1,9 +1,9 @@ -package com.ruoyi.invest.service; +package com.intc.invest.service; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.invest.domain.IUser; -import com.ruoyi.invest.domain.dto.IUserDto; -import com.ruoyi.invest.domain.vo.IUserVo; +import com.intc.invest.domain.IUser; +import com.intc.invest.domain.dto.IUserDto; +import com.intc.invest.domain.vo.IUserVo; import java.util.List; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsDealRecordServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsDealRecordServiceImpl.java similarity index 93% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsDealRecordServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsDealRecordServiceImpl.java index 04b8eb2..c6640d3 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsDealRecordServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsDealRecordServiceImpl.java @@ -1,18 +1,18 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.DictUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.invest.domain.AccountsDealRecord; -import com.ruoyi.invest.domain.dto.AccountsDealRecordDto; -import com.ruoyi.invest.domain.vo.AccountsDealRecordVo; -import com.ruoyi.invest.domain.vo.AccountsVo; -import com.ruoyi.invest.mapper.AccountsDealRecordMapper; -import com.ruoyi.invest.mapper.AccountsMapper; -import com.ruoyi.invest.service.IAccountsDealRecordService; -import com.ruoyi.invest.service.ICreditCardBillService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.utils.DictUtils; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.invest.domain.AccountsDealRecord; +import com.intc.invest.domain.dto.AccountsDealRecordDto; +import com.intc.invest.domain.vo.AccountsDealRecordVo; +import com.intc.invest.domain.vo.AccountsVo; +import com.intc.invest.mapper.AccountsDealRecordMapper; +import com.intc.invest.mapper.AccountsMapper; +import com.intc.invest.service.IAccountsDealRecordService; +import com.intc.invest.service.ICreditCardBillService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsServiceImpl.java similarity index 90% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsServiceImpl.java index 3b3fc2e..c6b5bb1 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsServiceImpl.java @@ -1,14 +1,14 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.invest.domain.Accounts; -import com.ruoyi.invest.domain.dto.AccountsDto; -import com.ruoyi.invest.domain.vo.AccountsVo; -import com.ruoyi.invest.mapper.AccountsMapper; -import com.ruoyi.invest.service.IAccountsService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.invest.domain.Accounts; +import com.intc.invest.domain.dto.AccountsDto; +import com.intc.invest.domain.vo.AccountsVo; +import com.intc.invest.mapper.AccountsMapper; +import com.intc.invest.service.IAccountsService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java similarity index 98% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java index d85d10d..4e3e49c 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/AccountsTransferRecordServiceImpl.java @@ -1,17 +1,17 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.invest.domain.AccountsDealRecord; -import com.ruoyi.invest.domain.AccountsTransferRecord; -import com.ruoyi.invest.domain.dto.AccountsDealRecordDto; -import com.ruoyi.invest.domain.dto.AccountsTransferRecordDto; -import com.ruoyi.invest.domain.vo.*; -import com.ruoyi.invest.mapper.*; -import com.ruoyi.invest.service.IAccountsTransferRecordService; -import com.ruoyi.invest.service.ICreditCardBillService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.invest.domain.AccountsDealRecord; +import com.intc.invest.domain.AccountsTransferRecord; +import com.intc.invest.domain.dto.AccountsDealRecordDto; +import com.intc.invest.domain.dto.AccountsTransferRecordDto; +import com.intc.invest.domain.vo.*; +import com.intc.invest.mapper.*; +import com.intc.invest.service.IAccountsTransferRecordService; +import com.intc.invest.service.ICreditCardBillService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/BankCardLendServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/BankCardLendServiceImpl.java similarity index 89% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/BankCardLendServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/BankCardLendServiceImpl.java index ab5a7d8..e5fd8a4 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/BankCardLendServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/BankCardLendServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.invest.domain.Accounts; -import com.ruoyi.invest.domain.BankCardLend; -import com.ruoyi.invest.domain.dto.BankCardLendDto; -import com.ruoyi.invest.domain.vo.BankCardLendVo; -import com.ruoyi.invest.mapper.AccountsMapper; -import com.ruoyi.invest.mapper.BankCardLendMapper; -import com.ruoyi.invest.service.IBankCardLendService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.invest.domain.Accounts; +import com.intc.invest.domain.BankCardLend; +import com.intc.invest.domain.dto.BankCardLendDto; +import com.intc.invest.domain.vo.BankCardLendVo; +import com.intc.invest.mapper.AccountsMapper; +import com.intc.invest.mapper.BankCardLendMapper; +import com.intc.invest.service.IBankCardLendService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/BankCardLimitHistoryServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/BankCardLimitHistoryServiceImpl.java similarity index 86% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/BankCardLimitHistoryServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/BankCardLimitHistoryServiceImpl.java index f317231..9799762 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/BankCardLimitHistoryServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/BankCardLimitHistoryServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.invest.domain.BankCardLimitHistory; -import com.ruoyi.invest.domain.dto.BankCardLimitHistoryDto; -import com.ruoyi.invest.domain.vo.BankCardLimitHistoryVo; -import com.ruoyi.invest.mapper.BankCardLimitHistoryMapper; -import com.ruoyi.invest.service.IBankCardLimitHistoryService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.invest.domain.BankCardLimitHistory; +import com.intc.invest.domain.dto.BankCardLimitHistoryDto; +import com.intc.invest.domain.vo.BankCardLimitHistoryVo; +import com.intc.invest.mapper.BankCardLimitHistoryMapper; +import com.intc.invest.service.IBankCardLimitHistoryService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditCardBillServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditCardBillServiceImpl.java similarity index 95% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditCardBillServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditCardBillServiceImpl.java index bb079c5..26e5cc4 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditCardBillServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditCardBillServiceImpl.java @@ -1,20 +1,20 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.invest.domain.CreditCardBill; -import com.ruoyi.invest.domain.dto.AccountsDealRecordDto; -import com.ruoyi.invest.domain.dto.BankCardLendDto; -import com.ruoyi.invest.domain.dto.CreditCardBillDto; -import com.ruoyi.invest.domain.vo.AccountsDealRecordVo; -import com.ruoyi.invest.domain.vo.BankCardLendVo; -import com.ruoyi.invest.domain.vo.CreditCardBillVo; -import com.ruoyi.invest.mapper.AccountsDealRecordMapper; -import com.ruoyi.invest.mapper.BankCardLendMapper; -import com.ruoyi.invest.mapper.CreditCardBillMapper; -import com.ruoyi.invest.service.ICreditCardBillService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.invest.domain.CreditCardBill; +import com.intc.invest.domain.dto.AccountsDealRecordDto; +import com.intc.invest.domain.dto.BankCardLendDto; +import com.intc.invest.domain.dto.CreditCardBillDto; +import com.intc.invest.domain.vo.AccountsDealRecordVo; +import com.intc.invest.domain.vo.BankCardLendVo; +import com.intc.invest.domain.vo.CreditCardBillVo; +import com.intc.invest.mapper.AccountsDealRecordMapper; +import com.intc.invest.mapper.BankCardLendMapper; +import com.intc.invest.mapper.CreditCardBillMapper; +import com.intc.invest.service.ICreditCardBillService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditReportQueryRecordServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditReportQueryRecordServiceImpl.java similarity index 93% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditReportQueryRecordServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditReportQueryRecordServiceImpl.java index fd52295..00339a7 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditReportQueryRecordServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/CreditReportQueryRecordServiceImpl.java @@ -1,14 +1,14 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.invest.domain.CreditReportQueryRecord; -import com.ruoyi.invest.domain.dto.CreditReportQueryRecordDto; -import com.ruoyi.invest.domain.vo.CreditReportAnalysisVO; -import com.ruoyi.invest.domain.vo.CreditReportQueryRecordVo; -import com.ruoyi.invest.mapper.CreditReportQueryRecordMapper; -import com.ruoyi.invest.service.ICreditReportQueryRecordService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.invest.domain.CreditReportQueryRecord; +import com.intc.invest.domain.dto.CreditReportQueryRecordDto; +import com.intc.invest.domain.vo.CreditReportAnalysisVO; +import com.intc.invest.domain.vo.CreditReportQueryRecordVo; +import com.intc.invest.mapper.CreditReportQueryRecordMapper; +import com.intc.invest.service.ICreditReportQueryRecordService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/DebitInforsServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/DebitInforsServiceImpl.java similarity index 84% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/DebitInforsServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/DebitInforsServiceImpl.java index 0a97a33..3062345 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/DebitInforsServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/DebitInforsServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.invest.domain.DebitInfors; -import com.ruoyi.invest.domain.dto.DebitInforsDto; -import com.ruoyi.invest.domain.vo.DebitInforsVo; -import com.ruoyi.invest.mapper.DebitInforsMapper; -import com.ruoyi.invest.service.IDebitInforsService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.invest.domain.DebitInfors; +import com.intc.invest.domain.dto.DebitInforsDto; +import com.intc.invest.domain.vo.DebitInforsVo; +import com.intc.invest.mapper.DebitInforsMapper; +import com.intc.invest.service.IDebitInforsService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksBillServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksBillServiceImpl.java similarity index 91% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksBillServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksBillServiceImpl.java index 6a19592..f24b4d1 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksBillServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksBillServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.invest.domain.FutureStocksBill; -import com.ruoyi.invest.domain.dto.FutureStocksBillDto; -import com.ruoyi.invest.domain.vo.FutureStocksBillVo; -import com.ruoyi.invest.mapper.FutureStocksBillMapper; -import com.ruoyi.invest.service.IFutureStocksBillService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.invest.domain.FutureStocksBill; +import com.intc.invest.domain.dto.FutureStocksBillDto; +import com.intc.invest.domain.vo.FutureStocksBillVo; +import com.intc.invest.mapper.FutureStocksBillMapper; +import com.intc.invest.service.IFutureStocksBillService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksServiceImpl.java similarity index 90% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksServiceImpl.java index 52dc5d1..6ae1858 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/FutureStocksServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.invest.domain.Accounts; -import com.ruoyi.invest.domain.FutureStocks; -import com.ruoyi.invest.domain.dto.FutureStocksDto; -import com.ruoyi.invest.domain.vo.FutureStocksVo; -import com.ruoyi.invest.mapper.AccountsMapper; -import com.ruoyi.invest.mapper.FutureStocksMapper; -import com.ruoyi.invest.service.IFutureStocksService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.invest.domain.Accounts; +import com.intc.invest.domain.FutureStocks; +import com.intc.invest.domain.dto.FutureStocksDto; +import com.intc.invest.domain.vo.FutureStocksVo; +import com.intc.invest.mapper.AccountsMapper; +import com.intc.invest.mapper.FutureStocksMapper; +import com.intc.invest.service.IFutureStocksService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/HeartJourneyServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/HeartJourneyServiceImpl.java similarity index 83% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/HeartJourneyServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/HeartJourneyServiceImpl.java index e472514..d57b032 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/HeartJourneyServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/HeartJourneyServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.invest.domain.HeartJourney; -import com.ruoyi.invest.domain.dto.HeartJourneyDto; -import com.ruoyi.invest.domain.vo.HeartJourneyVo; -import com.ruoyi.invest.mapper.HeartJourneyMapper; -import com.ruoyi.invest.service.IHeartJourneyService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.invest.domain.HeartJourney; +import com.intc.invest.domain.dto.HeartJourneyDto; +import com.intc.invest.domain.vo.HeartJourneyVo; +import com.intc.invest.mapper.HeartJourneyMapper; +import com.intc.invest.service.IHeartJourneyService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IItemServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IItemServiceImpl.java similarity index 85% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IItemServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IItemServiceImpl.java index fa409ed..ad0622e 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IItemServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IItemServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.invest.domain.IItem; -import com.ruoyi.invest.domain.dto.IItemDto; -import com.ruoyi.invest.domain.vo.IItemVo; -import com.ruoyi.invest.mapper.IItemMapper; -import com.ruoyi.invest.service.IIItemService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.invest.domain.IItem; +import com.intc.invest.domain.dto.IItemDto; +import com.intc.invest.domain.vo.IItemVo; +import com.intc.invest.mapper.IItemMapper; +import com.intc.invest.service.IIItemService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTLogServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTLogServiceImpl.java similarity index 86% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTLogServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTLogServiceImpl.java index eb8d399..50c5845 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTLogServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTLogServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.invest.domain.ILog; -import com.ruoyi.invest.domain.dto.ILogDto; -import com.ruoyi.invest.domain.vo.ILogVo; -import com.ruoyi.invest.mapper.ILogMapper; -import com.ruoyi.invest.service.IMTLogService; +import com.intc.common.core.utils.IdWorker; +import com.intc.invest.domain.ILog; +import com.intc.invest.domain.dto.ILogDto; +import com.intc.invest.domain.vo.ILogVo; +import com.intc.invest.mapper.ILogMapper; +import com.intc.invest.service.IMTLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTServiceImpl.java similarity index 97% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTServiceImpl.java index 45186f6..3c5fa68 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IMTServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; import cn.hutool.core.date.DateUnit; @@ -13,21 +13,21 @@ import cn.hutool.http.Method; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.RedisCache; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.invest.domain.IMTCacheConstants; -import com.ruoyi.invest.domain.IUser; -import com.ruoyi.invest.domain.vo.IItemVo; -import com.ruoyi.invest.domain.vo.IShopVo; -import com.ruoyi.invest.mapper.IItemMapper; -import com.ruoyi.invest.mapper.IShopMapper; -import com.ruoyi.invest.mapper.IUserMapper; -import com.ruoyi.invest.service.IMTLogFactory; -import com.ruoyi.invest.service.IMTService; -import com.ruoyi.invest.service.IShopService; -import com.ruoyi.invest.service.IUserService; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.text.Convert; +import com.intc.common.core.utils.RedisCache; +import com.intc.common.core.utils.StringUtils; +import com.intc.invest.domain.IMTCacheConstants; +import com.intc.invest.domain.IUser; +import com.intc.invest.domain.vo.IItemVo; +import com.intc.invest.domain.vo.IShopVo; +import com.intc.invest.mapper.IItemMapper; +import com.intc.invest.mapper.IShopMapper; +import com.intc.invest.mapper.IUserMapper; +import com.intc.invest.service.IMTLogFactory; +import com.intc.invest.service.IMTService; +import com.intc.invest.service.IShopService; +import com.intc.invest.service.IUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IShopServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IShopServiceImpl.java similarity index 95% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IShopServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IShopServiceImpl.java index bc02fe9..ef31346 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IShopServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IShopServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.convert.Convert; @@ -8,20 +8,20 @@ import cn.hutool.http.Method; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONException; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.core.utils.RedisCache; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.invest.domain.*; -import com.ruoyi.invest.domain.dto.IShopDto; -import com.ruoyi.invest.domain.vo.ICityVo; -import com.ruoyi.invest.domain.vo.IDistrictVo; -import com.ruoyi.invest.domain.vo.IProvinceVo; -import com.ruoyi.invest.domain.vo.IShopVo; -import com.ruoyi.invest.mapper.IItemMapper; -import com.ruoyi.invest.mapper.IShopMapper; -import com.ruoyi.invest.service.IShopService; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.core.utils.RedisCache; +import com.intc.common.core.utils.StringUtils; +import com.intc.invest.domain.*; +import com.intc.invest.domain.dto.IShopDto; +import com.intc.invest.domain.vo.ICityVo; +import com.intc.invest.domain.vo.IDistrictVo; +import com.intc.invest.domain.vo.IProvinceVo; +import com.intc.invest.domain.vo.IShopVo; +import com.intc.invest.mapper.IItemMapper; +import com.intc.invest.mapper.IShopMapper; +import com.intc.invest.service.IShopService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IUserServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IUserServiceImpl.java similarity index 93% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IUserServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IUserServiceImpl.java index f3bf65a..3e8efe6 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IUserServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/IUserServiceImpl.java @@ -1,18 +1,18 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.invest.domain.IShop; -import com.ruoyi.invest.domain.IUser; -import com.ruoyi.invest.domain.dto.IUserDto; -import com.ruoyi.invest.domain.vo.IItemVo; -import com.ruoyi.invest.domain.vo.IUserVo; -import com.ruoyi.invest.mapper.IItemMapper; -import com.ruoyi.invest.mapper.IShopMapper; -import com.ruoyi.invest.mapper.IUserMapper; -import com.ruoyi.invest.service.IUserService; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.invest.domain.IShop; +import com.intc.invest.domain.IUser; +import com.intc.invest.domain.dto.IUserDto; +import com.intc.invest.domain.vo.IItemVo; +import com.intc.invest.domain.vo.IUserVo; +import com.intc.invest.mapper.IItemMapper; +import com.intc.invest.mapper.IShopMapper; +import com.intc.invest.mapper.IUserMapper; +import com.intc.invest.service.IUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryDetailServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryDetailServiceImpl.java similarity index 89% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryDetailServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryDetailServiceImpl.java index 2075d17..de70cf5 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryDetailServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryDetailServiceImpl.java @@ -1,21 +1,21 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.invest.domain.AccountsDealRecord; -import com.ruoyi.invest.domain.InstallmentHistory; -import com.ruoyi.invest.domain.InstallmentHistoryDetail; -import com.ruoyi.invest.domain.dto.InstallmentHistoryDetailDto; -import com.ruoyi.invest.domain.vo.AccountsVo; -import com.ruoyi.invest.domain.vo.InstallmentHistoryDetailVo; -import com.ruoyi.invest.domain.vo.InstallmentHistoryVo; -import com.ruoyi.invest.mapper.AccountsDealRecordMapper; -import com.ruoyi.invest.mapper.AccountsMapper; -import com.ruoyi.invest.mapper.InstallmentHistoryDetailMapper; -import com.ruoyi.invest.mapper.InstallmentHistoryMapper; -import com.ruoyi.invest.service.IInstallmentHistoryDetailService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.invest.domain.AccountsDealRecord; +import com.intc.invest.domain.InstallmentHistory; +import com.intc.invest.domain.InstallmentHistoryDetail; +import com.intc.invest.domain.dto.InstallmentHistoryDetailDto; +import com.intc.invest.domain.vo.AccountsVo; +import com.intc.invest.domain.vo.InstallmentHistoryDetailVo; +import com.intc.invest.domain.vo.InstallmentHistoryVo; +import com.intc.invest.mapper.AccountsDealRecordMapper; +import com.intc.invest.mapper.AccountsMapper; +import com.intc.invest.mapper.InstallmentHistoryDetailMapper; +import com.intc.invest.mapper.InstallmentHistoryMapper; +import com.intc.invest.service.IInstallmentHistoryDetailService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryServiceImpl.java similarity index 93% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryServiceImpl.java index 31bee93..86cad26 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/InstallmentHistoryServiceImpl.java @@ -1,18 +1,18 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.invest.domain.InstallmentHistory; -import com.ruoyi.invest.domain.InstallmentHistoryDetail; -import com.ruoyi.invest.domain.dto.InstallmentHistoryDetailDto; -import com.ruoyi.invest.domain.dto.InstallmentHistoryDto; -import com.ruoyi.invest.domain.vo.InstallmentHistoryDetailVo; -import com.ruoyi.invest.domain.vo.InstallmentHistoryVo; -import com.ruoyi.invest.mapper.InstallmentHistoryDetailMapper; -import com.ruoyi.invest.mapper.InstallmentHistoryMapper; -import com.ruoyi.invest.service.IInstallmentHistoryService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.invest.domain.InstallmentHistory; +import com.intc.invest.domain.InstallmentHistoryDetail; +import com.intc.invest.domain.dto.InstallmentHistoryDetailDto; +import com.intc.invest.domain.dto.InstallmentHistoryDto; +import com.intc.invest.domain.vo.InstallmentHistoryDetailVo; +import com.intc.invest.domain.vo.InstallmentHistoryVo; +import com.intc.invest.mapper.InstallmentHistoryDetailMapper; +import com.intc.invest.mapper.InstallmentHistoryMapper; +import com.intc.invest.service.IInstallmentHistoryService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/PosMachineServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/PosMachineServiceImpl.java similarity index 90% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/PosMachineServiceImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/PosMachineServiceImpl.java index 755d7b5..8cfe7d7 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/PosMachineServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/PosMachineServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.invest.domain.Accounts; -import com.ruoyi.invest.domain.PosMachine; -import com.ruoyi.invest.domain.dto.PosMachineDto; -import com.ruoyi.invest.domain.vo.PosMachineVo; -import com.ruoyi.invest.mapper.AccountsMapper; -import com.ruoyi.invest.mapper.PosMachineMapper; -import com.ruoyi.invest.service.IPosMachineService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.invest.domain.Accounts; +import com.intc.invest.domain.PosMachine; +import com.intc.invest.domain.dto.PosMachineDto; +import com.intc.invest.domain.vo.PosMachineVo; +import com.intc.invest.mapper.AccountsMapper; +import com.intc.invest.mapper.PosMachineMapper; +import com.intc.invest.service.IPosMachineService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java similarity index 99% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java index 27fcf82..56e093f 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.invest.service.impl; +package com.intc.invest.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.DictUtils; -import com.ruoyi.invest.domain.dto.*; -import com.ruoyi.invest.domain.vo.*; -import com.ruoyi.invest.mapper.*; -import com.ruoyi.invest.service.IStatisticAnalysisService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.utils.DictUtils; +import com.intc.invest.domain.dto.*; +import com.intc.invest.domain.vo.*; +import com.intc.invest.mapper.*; +import com.intc.invest.service.IStatisticAnalysisService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/job/controller/InvestJob.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/job/controller/InvestJob.java similarity index 94% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/job/controller/InvestJob.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/job/controller/InvestJob.java index 4f27344..12ec7d4 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/job/controller/InvestJob.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/job/controller/InvestJob.java @@ -1,10 +1,10 @@ -package com.ruoyi.job.controller; +package com.intc.job.controller; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.invest.service.IMTService; -import com.ruoyi.invest.service.IUserService; -import com.ruoyi.job.service.IInvestJobService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.invest.service.IMTService; +import com.intc.invest.service.IUserService; +import com.intc.job.service.IInvestJobService; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/job/service/IInvestJobService.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/job/service/IInvestJobService.java similarity index 94% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/job/service/IInvestJobService.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/job/service/IInvestJobService.java index d819068..cb99a28 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/job/service/IInvestJobService.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/job/service/IInvestJobService.java @@ -1,4 +1,4 @@ -package com.ruoyi.job.service; +package com.intc.job.service; /** diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/job/service/impl/InvestJobImpl.java b/intc-modules/intc-invest/src/main/java/com/ruoyi/job/service/impl/InvestJobImpl.java similarity index 98% rename from ruoyi-modules/intc-invest/src/main/java/com/ruoyi/job/service/impl/InvestJobImpl.java rename to intc-modules/intc-invest/src/main/java/com/ruoyi/job/service/impl/InvestJobImpl.java index 34ce5ef..2ed423f 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/job/service/impl/InvestJobImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/ruoyi/job/service/impl/InvestJobImpl.java @@ -1,14 +1,14 @@ -package com.ruoyi.job.service.impl; +package com.intc.job.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.invest.domain.*; -import com.ruoyi.invest.domain.dto.*; -import com.ruoyi.invest.domain.vo.*; -import com.ruoyi.invest.mapper.*; -import com.ruoyi.job.service.IInvestJobService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.invest.domain.*; +import com.intc.invest.domain.dto.*; +import com.intc.invest.domain.vo.*; +import com.intc.invest.mapper.*; +import com.intc.job.service.IInvestJobService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/intc-invest/src/main/resources/banner.txt b/intc-modules/intc-invest/src/main/resources/banner.txt similarity index 100% rename from ruoyi-modules/intc-invest/src/main/resources/banner.txt rename to intc-modules/intc-invest/src/main/resources/banner.txt diff --git a/ruoyi-modules/intc-invest/src/main/resources/bootstrap.yml b/intc-modules/intc-invest/src/main/resources/bootstrap.yml similarity index 88% rename from ruoyi-modules/intc-invest/src/main/resources/bootstrap.yml rename to intc-modules/intc-invest/src/main/resources/bootstrap.yml index f8c21ba..b89088d 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/bootstrap.yml +++ b/intc-modules/intc-invest/src/main/resources/bootstrap.yml @@ -21,13 +21,13 @@ spring: cloud: nacos: discovery: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 服务注册地址 server-addr: 101.126.95.100:8858 group: intc ip: 8.140.22.151 config: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 配置中心地址 server-addr: 101.126.95.100:8858 # 配置文件格式 diff --git a/ruoyi-modules/intc-health/src/main/resources/logback.xml b/intc-modules/intc-invest/src/main/resources/logback.xml similarity index 98% rename from ruoyi-modules/intc-health/src/main/resources/logback.xml rename to intc-modules/intc-invest/src/main/resources/logback.xml index 0dc6014..2a2cca0 100644 --- a/ruoyi-modules/intc-health/src/main/resources/logback.xml +++ b/intc-modules/intc-invest/src/main/resources/logback.xml @@ -58,7 +58,7 @@ - + diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsDealRecordMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/AccountsDealRecordMapper.xml similarity index 99% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsDealRecordMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/AccountsDealRecordMapper.xml index 6209045..dc7af13 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsDealRecordMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/AccountsDealRecordMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/AccountsMapper.xml similarity index 99% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/AccountsMapper.xml index 83bc86b..f66b30b 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/AccountsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsTransferRecordMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/AccountsTransferRecordMapper.xml similarity index 99% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsTransferRecordMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/AccountsTransferRecordMapper.xml index ab55c02..64ff93c 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/AccountsTransferRecordMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/AccountsTransferRecordMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml similarity index 99% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml index cd6f53b..1a15906 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/BankCardLendMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLimitHistoryMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/BankCardLimitHistoryMapper.xml similarity index 99% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLimitHistoryMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/BankCardLimitHistoryMapper.xml index 4ace866..d9fb7bc 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/BankCardLimitHistoryMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/BankCardLimitHistoryMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/CreditCardBillMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/CreditCardBillMapper.xml similarity index 99% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/CreditCardBillMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/CreditCardBillMapper.xml index 7676a63..0125a83 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/CreditCardBillMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/CreditCardBillMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/CreditReportQueryRecordMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/CreditReportQueryRecordMapper.xml similarity index 98% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/CreditReportQueryRecordMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/CreditReportQueryRecordMapper.xml index ee87d0f..88ed5a1 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/CreditReportQueryRecordMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/CreditReportQueryRecordMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/DebitInforsMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/DebitInforsMapper.xml similarity index 99% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/DebitInforsMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/DebitInforsMapper.xml index e69b07f..b5f97e6 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/DebitInforsMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/DebitInforsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksBillMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksBillMapper.xml similarity index 99% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksBillMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksBillMapper.xml index 08853d6..986704f 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksBillMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksBillMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksMapper.xml similarity index 99% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksMapper.xml index 209bbc1..9a240b5 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/FutureStocksMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/HeartJourneyMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/HeartJourneyMapper.xml similarity index 98% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/HeartJourneyMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/HeartJourneyMapper.xml index dd7c254..eb8569a 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/HeartJourneyMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/HeartJourneyMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IItemMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/IItemMapper.xml similarity index 98% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IItemMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/IItemMapper.xml index 13df7f9..0c7b698 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IItemMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/IItemMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/ILogMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/ILogMapper.xml similarity index 98% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/ILogMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/ILogMapper.xml index 613ad08..34271b0 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/ILogMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/ILogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IShopMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/IShopMapper.xml similarity index 98% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IShopMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/IShopMapper.xml index acc6064..cd9595e 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IShopMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/IShopMapper.xml @@ -2,7 +2,7 @@ - + @@ -169,7 +169,7 @@ where a.i_shop_id = #{iShopId} - select distinct a.province_name as provinceName @@ -187,7 +187,7 @@ order by a.province_name desc - select distinct a.city_name as cityName @@ -209,7 +209,7 @@ order by a.city_name desc - select distinct a.district_name as districtName diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IUserMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/IUserMapper.xml similarity index 99% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IUserMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/IUserMapper.xml index 066a52b..631ec84 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/IUserMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/IUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryDetailMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryDetailMapper.xml similarity index 99% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryDetailMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryDetailMapper.xml index 6182cd2..b9feb2f 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryDetailMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryDetailMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml similarity index 99% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml index 505313b..b4454f0 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/InstallmentHistoryMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/PosMachineMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/PosMachineMapper.xml similarity index 99% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/PosMachineMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/PosMachineMapper.xml index 9bad188..f784324 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/PosMachineMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/PosMachineMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/StatisticAnalysisMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/StatisticAnalysisMapper.xml similarity index 98% rename from ruoyi-modules/intc-invest/src/main/resources/mapper/invest/StatisticAnalysisMapper.xml rename to intc-modules/intc-invest/src/main/resources/mapper/invest/StatisticAnalysisMapper.xml index a4609e1..4e83b03 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/mapper/invest/StatisticAnalysisMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/StatisticAnalysisMapper.xml @@ -2,7 +2,7 @@ - + @@ -267,7 +267,7 @@ 'yyyy-MM-dd') desc - select a."name" , sum(a.available_limit) as availableLimit diff --git a/ruoyi-modules/intc-invest/src/main/resources/static/images/qrcode_logo.jpg b/intc-modules/intc-invest/src/main/resources/static/images/qrcode_logo.jpg similarity index 100% rename from ruoyi-modules/intc-invest/src/main/resources/static/images/qrcode_logo.jpg rename to intc-modules/intc-invest/src/main/resources/static/images/qrcode_logo.jpg diff --git a/ruoyi-modules/intc-invest/src/main/resources/static/images/qrcode_template.jpg b/intc-modules/intc-invest/src/main/resources/static/images/qrcode_template.jpg similarity index 100% rename from ruoyi-modules/intc-invest/src/main/resources/static/images/qrcode_template.jpg rename to intc-modules/intc-invest/src/main/resources/static/images/qrcode_template.jpg diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/intc-modules/intc-job/pom.xml similarity index 87% rename from ruoyi-modules/ruoyi-job/pom.xml rename to intc-modules/intc-job/pom.xml index 691c54c..23e1355 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/intc-modules/intc-job/pom.xml @@ -3,16 +3,16 @@ 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"> - com.ruoyi - ruoyi-modules + com.intc + intc-modules 3.6.3 4.0.0 - ruoyi-modules-job + intc-modules-job - ruoyi-modules-job定时任务 + intc-modules-job定时任务 @@ -54,12 +54,7 @@ springfox-swagger-ui ${swagger.fox.version} - - com.ruoyi - ruoyi-api-invest - 3.6.3 - compile - + org.quartz-scheduler @@ -80,17 +75,23 @@ - com.ruoyi - ruoyi-common-log + com.intc + intc-common-log 3.6.3 - com.ruoyi - ruoyi-common-swagger + com.intc + intc-common-swagger 3.6.3 + + com.intc + intc-api-invest + 3.6.3 + compile + diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java b/intc-modules/intc-job/src/main/java/com/intc/job/IntcJobApplication.java similarity index 75% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java rename to intc-modules/intc-job/src/main/java/com/intc/job/IntcJobApplication.java index 15c1a5d..688df40 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/IntcJobApplication.java @@ -1,10 +1,10 @@ -package com.ruoyi.job; +package com.intc.job; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import com.ruoyi.common.security.annotation.EnableCustomConfig; -import com.ruoyi.common.security.annotation.EnableRyFeignClients; -import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; +import com.intc.common.security.annotation.EnableCustomConfig; +import com.intc.common.security.annotation.EnableRyFeignClients; +import com.intc.common.swagger.annotation.EnableCustomSwagger2; /** * 定时任务 @@ -15,11 +15,11 @@ import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; @EnableCustomSwagger2 @EnableRyFeignClients @SpringBootApplication -public class RuoYiJobApplication +public class IntcJobApplication { public static void main(String[] args) { - SpringApplication.run(RuoYiJobApplication.class, args); + SpringApplication.run(IntcJobApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 定时任务模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + diff --git a/intc-modules/intc-job/src/main/java/com/intc/job/config/ActuatorSecurityConfig.java b/intc-modules/intc-job/src/main/java/com/intc/job/config/ActuatorSecurityConfig.java new file mode 100644 index 0000000..85ccfab --- /dev/null +++ b/intc-modules/intc-job/src/main/java/com/intc/job/config/ActuatorSecurityConfig.java @@ -0,0 +1,44 @@ +package com.intc.job.config; + +import com.intc.common.core.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.web.SecurityFilterChain; + +/** + * @ClassName ActuatorSecurityConfig + * @Author YaphetS + * @Date 2023/3/14 9:18 + * @Version 1.0 + * @Description TODO + */ +@Configuration +@EnableWebSecurity +@EnableGlobalMethodSecurity(prePostEnabled = true) +public class ActuatorSecurityConfig { + + @Autowired + Environment env; + + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + String contextPath = env.getProperty("management.endpoints.web.base-path"); + if(StringUtils.isEmpty(contextPath)) { + contextPath = "/actuator"; + } + http.csrf().disable(); + http.authorizeRequests() + .antMatchers("/**"+contextPath+"/**") + .authenticated() + .anyRequest() + .permitAll() + .and() + .httpBasic(); + return http.build(); + } +} diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java b/intc-modules/intc-job/src/main/java/com/intc/job/config/ScheduleConfig.java similarity index 98% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java rename to intc-modules/intc-job/src/main/java/com/intc/job/config/ScheduleConfig.java index 43279f0..83a0467 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/ScheduleConfig.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/config/ScheduleConfig.java @@ -1,4 +1,4 @@ -//package com.ruoyi.job.config; +//package com.intc.job.config; // //import java.util.Properties; //import javax.sql.DataSource; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java b/intc-modules/intc-job/src/main/java/com/intc/job/controller/SysJobController.java similarity index 89% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java rename to intc-modules/intc-job/src/main/java/com/intc/job/controller/SysJobController.java index 7625e88..062729a 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/controller/SysJobController.java @@ -1,4 +1,4 @@ -package com.ruoyi.job.controller; +package com.intc.job.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -12,21 +12,21 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.exception.job.TaskException; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.job.domain.SysJob; -import com.ruoyi.job.service.ISysJobService; -import com.ruoyi.job.util.CronUtils; -import com.ruoyi.job.util.ScheduleUtils; +import com.intc.common.core.constant.Constants; +import com.intc.common.core.exception.job.TaskException; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.job.domain.SysJob; +import com.intc.job.service.ISysJobService; +import com.intc.job.util.CronUtils; +import com.intc.job.util.ScheduleUtils; /** * 调度任务信息操作处理 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java b/intc-modules/intc-job/src/main/java/com/intc/job/controller/SysJobLogController.java similarity index 83% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java rename to intc-modules/intc-job/src/main/java/com/intc/job/controller/SysJobLogController.java index caf7451..f2f9c09 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/controller/SysJobLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.job.controller; +package com.intc.job.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -9,15 +9,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.job.domain.SysJobLog; -import com.ruoyi.job.service.ISysJobLogService; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.job.domain.SysJobLog; +import com.intc.job.service.ISysJobLogService; /** * 调度日志操作处理 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java b/intc-modules/intc-job/src/main/java/com/intc/job/domain/SysJob.java similarity index 92% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java rename to intc-modules/intc-job/src/main/java/com/intc/job/domain/SysJob.java index dd630ba..fcad0ae 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/domain/SysJob.java @@ -1,4 +1,4 @@ -package com.ruoyi.job.domain; +package com.intc.job.domain; import java.util.Date; import javax.validation.constraints.NotBlank; @@ -6,12 +6,12 @@ import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; 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.constant.ScheduleConstants; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.web.domain.BaseEntity; -import com.ruoyi.job.util.CronUtils; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.annotation.Excel.ColumnType; +import com.intc.common.core.constant.ScheduleConstants; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.web.domain.BaseEntity; +import com.intc.job.util.CronUtils; /** * 定时任务调度表 sys_job diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java b/intc-modules/intc-job/src/main/java/com/intc/job/domain/SysJobLog.java similarity index 96% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java rename to intc-modules/intc-job/src/main/java/com/intc/job/domain/SysJobLog.java index 6c2c7ed..5f7c291 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/domain/SysJobLog.java @@ -1,10 +1,10 @@ -package com.ruoyi.job.domain; +package com.intc.job.domain; import java.util.Date; 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.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; /** * 定时任务调度日志表 sys_job_log diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java b/intc-modules/intc-job/src/main/java/com/intc/job/mapper/SysJobLogMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java rename to intc-modules/intc-job/src/main/java/com/intc/job/mapper/SysJobLogMapper.java index 80f0716..9e5f93e 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/mapper/SysJobLogMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.job.mapper; +package com.intc.job.mapper; import java.util.List; -import com.ruoyi.job.domain.SysJobLog; +import com.intc.job.domain.SysJobLog; /** * 调度任务日志信息 数据层 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java b/intc-modules/intc-job/src/main/java/com/intc/job/mapper/SysJobMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java rename to intc-modules/intc-job/src/main/java/com/intc/job/mapper/SysJobMapper.java index d7e499e..862d5e5 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/mapper/SysJobMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.job.mapper; +package com.intc.job.mapper; import java.util.List; -import com.ruoyi.job.domain.SysJob; +import com.intc.job.domain.SysJob; /** * 调度任务信息 数据层 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java b/intc-modules/intc-job/src/main/java/com/intc/job/service/ISysJobLogService.java similarity index 94% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java rename to intc-modules/intc-job/src/main/java/com/intc/job/service/ISysJobLogService.java index 75b3dc5..1617d08 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobLogService.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/service/ISysJobLogService.java @@ -1,7 +1,7 @@ -package com.ruoyi.job.service; +package com.intc.job.service; import java.util.List; -import com.ruoyi.job.domain.SysJobLog; +import com.intc.job.domain.SysJobLog; /** * 定时任务调度日志信息信息 服务层 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java b/intc-modules/intc-job/src/main/java/com/intc/job/service/ISysJobService.java similarity index 94% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java rename to intc-modules/intc-job/src/main/java/com/intc/job/service/ISysJobService.java index 5270b34..adf59f5 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/ISysJobService.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/service/ISysJobService.java @@ -1,9 +1,9 @@ -package com.ruoyi.job.service; +package com.intc.job.service; import java.util.List; import org.quartz.SchedulerException; -import com.ruoyi.common.core.exception.job.TaskException; -import com.ruoyi.job.domain.SysJob; +import com.intc.common.core.exception.job.TaskException; +import com.intc.job.domain.SysJob; /** * 定时任务调度信息信息 服务层 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java b/intc-modules/intc-job/src/main/java/com/intc/job/service/SysJobLogServiceImpl.java similarity index 93% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java rename to intc-modules/intc-job/src/main/java/com/intc/job/service/SysJobLogServiceImpl.java index 41bdcca..e69ec58 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobLogServiceImpl.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/service/SysJobLogServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.job.service; +package com.intc.job.service; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.job.domain.SysJobLog; -import com.ruoyi.job.mapper.SysJobLogMapper; +import com.intc.job.domain.SysJobLog; +import com.intc.job.mapper.SysJobLogMapper; /** * 定时任务调度日志信息 服务层 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java b/intc-modules/intc-job/src/main/java/com/intc/job/service/SysJobServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java rename to intc-modules/intc-job/src/main/java/com/intc/job/service/SysJobServiceImpl.java index 8936b9c..d080dcb 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/service/SysJobServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.job.service; +package com.intc.job.service; import java.util.List; import javax.annotation.PostConstruct; @@ -9,12 +9,12 @@ import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.core.constant.ScheduleConstants; -import com.ruoyi.common.core.exception.job.TaskException; -import com.ruoyi.job.domain.SysJob; -import com.ruoyi.job.mapper.SysJobMapper; -import com.ruoyi.job.util.CronUtils; -import com.ruoyi.job.util.ScheduleUtils; +import com.intc.common.core.constant.ScheduleConstants; +import com.intc.common.core.exception.job.TaskException; +import com.intc.job.domain.SysJob; +import com.intc.job.mapper.SysJobMapper; +import com.intc.job.util.CronUtils; +import com.intc.job.util.ScheduleUtils; /** * 定时任务调度信息 服务层 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/InvestJobTask.java b/intc-modules/intc-job/src/main/java/com/intc/job/task/InvestJobTask.java similarity index 97% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/InvestJobTask.java rename to intc-modules/intc-job/src/main/java/com/intc/job/task/InvestJobTask.java index 4a61cba..fcbb61c 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/InvestJobTask.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/task/InvestJobTask.java @@ -1,7 +1,8 @@ -package com.ruoyi.job.task; +package com.intc.job.task; -import com.ruoyi.api.invest.RemoteInvestService; -import com.ruoyi.common.core.utils.DateUtils; + +import com.intc.api.invest.RemoteInvestService; +import com.intc.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/InvestProdJobTask.java b/intc-modules/intc-job/src/main/java/com/intc/job/task/InvestProdJobTask.java similarity index 97% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/InvestProdJobTask.java rename to intc-modules/intc-job/src/main/java/com/intc/job/task/InvestProdJobTask.java index 8b9e810..390bac9 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/InvestProdJobTask.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/task/InvestProdJobTask.java @@ -1,7 +1,7 @@ -package com.ruoyi.job.task; +package com.intc.job.task; -import com.ruoyi.api.invest.RemoteInvestProdService; -import com.ruoyi.common.core.utils.DateUtils; +import com.intc.api.invest.RemoteInvestProdService; +import com.intc.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java b/intc-modules/intc-job/src/main/java/com/intc/job/task/RyTask.java similarity index 89% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java rename to intc-modules/intc-job/src/main/java/com/intc/job/task/RyTask.java index 3a127ef..0c5172a 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/task/RyTask.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/task/RyTask.java @@ -1,7 +1,7 @@ -package com.ruoyi.job.task; +package com.intc.job.task; import org.springframework.stereotype.Component; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; /** * 定时任务调度测试 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java b/intc-modules/intc-job/src/main/java/com/intc/job/util/AbstractQuartzJob.java similarity index 87% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java rename to intc-modules/intc-job/src/main/java/com/intc/job/util/AbstractQuartzJob.java index 55ff671..6ad71a4 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/util/AbstractQuartzJob.java @@ -1,4 +1,4 @@ -package com.ruoyi.job.util; +package com.intc.job.util; import java.util.Date; import org.quartz.Job; @@ -6,14 +6,14 @@ import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.core.constant.ScheduleConstants; -import com.ruoyi.common.core.utils.ExceptionUtil; -import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.bean.BeanUtils; -import com.ruoyi.job.domain.SysJob; -import com.ruoyi.job.domain.SysJobLog; -import com.ruoyi.job.service.ISysJobLogService; +import com.intc.common.core.constant.ScheduleConstants; +import com.intc.common.core.utils.ExceptionUtil; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.bean.BeanUtils; +import com.intc.job.domain.SysJob; +import com.intc.job.domain.SysJobLog; +import com.intc.job.service.ISysJobLogService; /** * 抽象quartz调用 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java b/intc-modules/intc-job/src/main/java/com/intc/job/util/CronUtils.java similarity index 98% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java rename to intc-modules/intc-job/src/main/java/com/intc/job/util/CronUtils.java index 9fc6c9f..333b556 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/CronUtils.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/util/CronUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.job.util; +package com.intc.job.util; import java.text.ParseException; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java b/intc-modules/intc-job/src/main/java/com/intc/job/util/JobInvokeUtil.java similarity index 97% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java rename to intc-modules/intc-job/src/main/java/com/intc/job/util/JobInvokeUtil.java index e21de55..35eae2b 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/util/JobInvokeUtil.java @@ -1,12 +1,12 @@ -package com.ruoyi.job.util; +package com.intc.job.util; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.LinkedList; import java.util.List; -import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.job.domain.SysJob; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.job.domain.SysJob; /** * 任务执行工具 diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java b/intc-modules/intc-job/src/main/java/com/intc/job/util/QuartzDisallowConcurrentExecution.java similarity index 87% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java rename to intc-modules/intc-job/src/main/java/com/intc/job/util/QuartzDisallowConcurrentExecution.java index 325bd93..fe939ae 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzDisallowConcurrentExecution.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/util/QuartzDisallowConcurrentExecution.java @@ -1,9 +1,9 @@ -package com.ruoyi.job.util; +package com.intc.job.util; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; -import com.ruoyi.job.domain.SysJob; +import com.intc.job.domain.SysJob; /** * 定时任务处理（禁止并发执行） diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java b/intc-modules/intc-job/src/main/java/com/intc/job/util/QuartzJobExecution.java similarity index 84% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java rename to intc-modules/intc-job/src/main/java/com/intc/job/util/QuartzJobExecution.java index bab4ee9..96fb513 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/QuartzJobExecution.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/util/QuartzJobExecution.java @@ -1,8 +1,8 @@ -package com.ruoyi.job.util; +package com.intc.job.util; import org.quartz.JobExecutionContext; -import com.ruoyi.job.domain.SysJob; +import com.intc.job.domain.SysJob; /** * 定时任务处理（允许并发执行） diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java b/intc-modules/intc-job/src/main/java/com/intc/job/util/ScheduleUtils.java similarity index 92% rename from ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java rename to intc-modules/intc-job/src/main/java/com/intc/job/util/ScheduleUtils.java index 4140140..76a2b8a 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java +++ b/intc-modules/intc-job/src/main/java/com/intc/job/util/ScheduleUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.job.util; +package com.intc.job.util; import org.quartz.CronScheduleBuilder; import org.quartz.CronTrigger; @@ -10,13 +10,13 @@ import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.quartz.TriggerBuilder; import org.quartz.TriggerKey; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.constant.ScheduleConstants; -import com.ruoyi.common.core.exception.job.TaskException; -import com.ruoyi.common.core.exception.job.TaskException.Code; -import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.job.domain.SysJob; +import com.intc.common.core.constant.Constants; +import com.intc.common.core.constant.ScheduleConstants; +import com.intc.common.core.exception.job.TaskException; +import com.intc.common.core.exception.job.TaskException.Code; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.job.domain.SysJob; /** * 定时任务工具类 diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/banner.txt b/intc-modules/intc-job/src/main/resources/banner.txt similarity index 100% rename from ruoyi-modules/ruoyi-job/src/main/resources/banner.txt rename to intc-modules/intc-job/src/main/resources/banner.txt diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/intc-modules/intc-job/src/main/resources/bootstrap.yml similarity index 84% rename from ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml rename to intc-modules/intc-job/src/main/resources/bootstrap.yml index 9157999..668143b 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/intc-modules/intc-job/src/main/resources/bootstrap.yml @@ -6,20 +6,20 @@ server: spring: application: # 应用名称 - name: ruoyi-job + name: intc-job profiles: # 环境配置 active: dev cloud: nacos: discovery: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 服务注册地址 server-addr: 101.126.95.100:8858 group: intc ip: 152.136.151.187 config: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 配置中心地址 server-addr: 101.126.95.100:8858 # 配置文件格式 diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/logback.xml b/intc-modules/intc-job/src/main/resources/logback.xml similarity index 96% rename from ruoyi-modules/ruoyi-file/src/main/resources/logback.xml rename to intc-modules/intc-job/src/main/resources/logback.xml index 25beecf..9cfb726 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/logback.xml +++ b/intc-modules/intc-job/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml b/intc-modules/intc-job/src/main/resources/mapper/job/SysJobLogMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml rename to intc-modules/intc-job/src/main/resources/mapper/job/SysJobLogMapper.xml index 124beef..63437c6 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml +++ b/intc-modules/intc-job/src/main/resources/mapper/job/SysJobLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml b/intc-modules/intc-job/src/main/resources/mapper/job/SysJobMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml rename to intc-modules/intc-job/src/main/resources/mapper/job/SysJobMapper.xml index a9a13a8..474e134 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml +++ b/intc-modules/intc-job/src/main/resources/mapper/job/SysJobMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/intc-modules/intc-system/pom.xml similarity index 85% rename from ruoyi-modules/ruoyi-system/pom.xml rename to intc-modules/intc-system/pom.xml index c1a1998..d80257b 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/intc-modules/intc-system/pom.xml @@ -3,16 +3,16 @@ 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"> - com.ruoyi - ruoyi-modules + com.intc + intc-modules 3.6.3 4.0.0 - ruoyi-modules-system + intc-modules-system - ruoyi-modules-system系统模块 + intc-modules-system系统模块 @@ -64,15 +64,15 @@ - com.ruoyi - ruoyi-common-datasource + com.intc + intc-common-datasource 3.6.3 - com.ruoyi - ruoyi-common-datascope + com.intc + intc-common-datascope 3.6.3 @@ -84,15 +84,15 @@ - com.ruoyi - ruoyi-common-log + com.intc + intc-common-log 3.6.3 - com.ruoyi - ruoyi-common-swagger + com.intc + intc-common-swagger 3.6.3 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java b/intc-modules/intc-system/src/main/java/com/intc/system/IntcSystemApplication.java similarity index 74% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java rename to intc-modules/intc-system/src/main/java/com/intc/system/IntcSystemApplication.java index 93d47ef..6df2ea1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/IntcSystemApplication.java @@ -1,10 +1,10 @@ -package com.ruoyi.system; +package com.intc.system; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import com.ruoyi.common.security.annotation.EnableCustomConfig; -import com.ruoyi.common.security.annotation.EnableRyFeignClients; -import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; +import com.intc.common.security.annotation.EnableCustomConfig; +import com.intc.common.security.annotation.EnableRyFeignClients; +import com.intc.common.swagger.annotation.EnableCustomSwagger2; /** * 系统模块 @@ -15,11 +15,11 @@ import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; @EnableCustomSwagger2 @EnableRyFeignClients @SpringBootApplication -public class RuoYiSystemApplication +public class IntcSystemApplication { public static void main(String[] args) { - SpringApplication.run(RuoYiSystemApplication.class, args); + SpringApplication.run(IntcSystemApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 系统模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + diff --git a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ActuatorSecurityConfig.java b/intc-modules/intc-system/src/main/java/com/intc/system/config/ActuatorSecurityConfig.java similarity index 94% rename from ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ActuatorSecurityConfig.java rename to intc-modules/intc-system/src/main/java/com/intc/system/config/ActuatorSecurityConfig.java index 4c22dea..3af388f 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/ActuatorSecurityConfig.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/config/ActuatorSecurityConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.file.config; +package com.intc.system.config; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysConfigController.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/SysConfigController.java index bfa9001..054748f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysConfigController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.intc.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.service.ISysConfigService; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.domain.SysConfig; +import com.intc.system.service.ISysConfigService; /** * 参数配置 信息操作处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysDeptController.java similarity index 88% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/SysDeptController.java index cf43c68..79b9b0e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysDeptController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.intc.system.controller; import java.util.List; import org.apache.commons.lang3.ArrayUtils; @@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysDept; -import com.ruoyi.system.service.ISysDeptService; +import com.intc.common.core.constant.UserConstants; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.api.domain.SysDept; +import com.intc.system.service.ISysDeptService; /** * 部门信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysDictDataController.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/SysDictDataController.java index ef90356..d8949cd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysDictDataController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.intc.system.controller; import java.util.ArrayList; import java.util.List; @@ -13,18 +13,18 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysDictData; -import com.ruoyi.system.service.ISysDictDataService; -import com.ruoyi.system.service.ISysDictTypeService; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.api.domain.SysDictData; +import com.intc.system.service.ISysDictDataService; +import com.intc.system.service.ISysDictTypeService; /** * 数据字典信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysDictTypeController.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/SysDictTypeController.java index 02b4e68..3fe3727 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysDictTypeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.intc.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysDictType; -import com.ruoyi.system.service.ISysDictTypeService; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.api.domain.SysDictType; +import com.intc.system.service.ISysDictTypeService; /** * 数据字典信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysLogininforController.java similarity index 80% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/SysLogininforController.java index 713043f..4b4bc0a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysLogininforController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.intc.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -10,18 +10,18 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.constant.CacheConstants; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.redis.service.RedisService; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.api.domain.SysLogininfor; -import com.ruoyi.system.service.ISysLogininforService; +import com.intc.common.core.constant.CacheConstants; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.redis.service.RedisService; +import com.intc.common.security.annotation.InnerAuth; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.system.api.domain.SysLogininfor; +import com.intc.system.service.ISysLogininforService; /** * 系统访问记录 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysMenuController.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/SysMenuController.java index 6cd9f24..943abc2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysMenuController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysMenuController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.intc.system.controller; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -11,16 +11,16 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.domain.SysMenu; -import com.ruoyi.system.service.ISysMenuService; +import com.intc.common.core.constant.UserConstants; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.domain.SysMenu; +import com.intc.system.service.ISysMenuService; /** * 菜单信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysNoticeController.java similarity index 83% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/SysNoticeController.java index 0f81b6f..fb99b94 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysNoticeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.intc.system.controller; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -11,15 +11,15 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.service.ISysNoticeService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.domain.SysNotice; +import com.intc.system.service.ISysNoticeService; /** * 公告 信息操作处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysOperlogController.java similarity index 79% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/SysOperlogController.java index 10c8045..64d4777 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysOperlogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.intc.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -10,16 +10,16 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.api.domain.SysOperLog; -import com.ruoyi.system.service.ISysOperLogService; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.InnerAuth; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.system.api.domain.SysOperLog; +import com.intc.system.service.ISysOperLogService; /** * 操作日志记录 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysPostController.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/SysPostController.java index 36ac90c..d77eb19 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysPostController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.intc.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.service.ISysPostService; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.domain.SysPost; +import com.intc.system.service.ISysPostService; /** * 岗位信息操作处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysProfileController.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/SysProfileController.java index 9dcbf88..9165cba 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysProfileController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.intc.system.controller; import java.util.Arrays; import org.springframework.beans.factory.annotation.Autowired; @@ -10,21 +10,21 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.file.FileTypeUtils; -import com.ruoyi.common.core.utils.file.MimeTypeUtils; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.service.TokenService; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.RemoteFileService; -import com.ruoyi.system.api.domain.SysFile; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.api.model.LoginUser; -import com.ruoyi.system.service.ISysUserService; +import com.intc.common.core.domain.R; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.file.FileTypeUtils; +import com.intc.common.core.utils.file.MimeTypeUtils; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.service.TokenService; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.api.RemoteFileService; +import com.intc.system.api.domain.SysFile; +import com.intc.system.api.domain.SysUser; +import com.intc.system.api.model.LoginUser; +import com.intc.system.service.ISysUserService; /** * 个人信息 业务处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysRoleController.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/SysRoleController.java index ef9f015..1016140 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysRoleController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.intc.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -12,21 +12,21 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysDept; -import com.ruoyi.system.api.domain.SysRole; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.service.ISysDeptService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.api.domain.SysDept; +import com.intc.system.api.domain.SysRole; +import com.intc.system.api.domain.SysUser; +import com.intc.system.domain.SysUserRole; +import com.intc.system.service.ISysDeptService; +import com.intc.system.service.ISysRoleService; +import com.intc.system.service.ISysUserService; /** * 角色信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysScreenLocationController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysScreenLocationController.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysScreenLocationController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/SysScreenLocationController.java index f784b3c..d57f50c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysScreenLocationController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysScreenLocationController.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.controller; +package com.intc.system.controller; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.domain.SysScreenLocation; -import com.ruoyi.system.domain.dto.SysScreenLocationDto; -import com.ruoyi.system.domain.vo.SysScreenLocationVo; -import com.ruoyi.system.domain.vo.SysScreenModuleVo; -import com.ruoyi.system.service.ISysScreenLocationService; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.system.domain.SysScreenLocation; +import com.intc.system.domain.dto.SysScreenLocationDto; +import com.intc.system.domain.vo.SysScreenLocationVo; +import com.intc.system.domain.vo.SysScreenModuleVo; +import com.intc.system.service.ISysScreenLocationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysUserController.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/SysUserController.java index 2808674..945b363 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysUserController.java @@ -1,21 +1,21 @@ -package com.ruoyi.system.controller; +package com.intc.system.controller; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.poi.ExcelUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.security.annotation.InnerAuth; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysDept; -import com.ruoyi.system.api.domain.SysRole; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.api.model.LoginUser; -import com.ruoyi.system.service.*; +import com.intc.common.core.domain.R; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.poi.ExcelUtil; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.InnerAuth; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.api.domain.SysDept; +import com.intc.system.api.domain.SysRole; +import com.intc.system.api.domain.SysUser; +import com.intc.system.api.model.LoginUser; +import com.intc.system.service.*; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysUserOnlineController.java similarity index 78% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java rename to intc-modules/intc-system/src/main/java/com/intc/system/controller/SysUserOnlineController.java index e9ed9bb..5cde5ab 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserOnlineController.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/controller/SysUserOnlineController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.intc.system.controller; import java.util.ArrayList; import java.util.Collection; @@ -10,18 +10,18 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.core.constant.CacheConstants; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.core.web.page.TableDataInfo; -import com.ruoyi.common.log.annotation.Log; -import com.ruoyi.common.log.enums.BusinessType; -import com.ruoyi.common.redis.service.RedisService; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.system.api.model.LoginUser; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.intc.common.core.constant.CacheConstants; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.page.TableDataInfo; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.redis.service.RedisService; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.system.api.model.LoginUser; +import com.intc.system.domain.SysUserOnline; +import com.intc.system.service.ISysUserOnlineService; /** * 在线用户监控 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysConfig.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysConfig.java index a1e22ef..b37f121 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysConfig.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.domain; +package com.intc.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.annotation.Excel; -import com.ruoyi.common.core.annotation.Excel.ColumnType; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.annotation.Excel.ColumnType; +import com.intc.common.core.web.domain.BaseEntity; /** * 参数配置表 sys_config diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysMenu.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysMenu.java index adfe1a3..919ec4a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysMenu.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.intc.system.domain; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; 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.intc.common.core.web.domain.BaseEntity; /** * 菜单权限表 sys_menu diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysNotice.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysNotice.java index 144fcdf..e3a58dd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysNotice.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.domain; +package com.intc.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; +import com.intc.common.core.web.domain.BaseEntity; +import com.intc.common.core.xss.Xss; /** * 通知公告表 sys_notice diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysPost.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysPost.java index 71ad02b..10b01a5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysPost.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.domain; +package com.intc.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; 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; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.annotation.Excel.ColumnType; +import com.intc.common.core.web.domain.BaseEntity; /** * 岗位表 sys_post diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysRoleDept.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysRoleDept.java index 47b21bf..1b2d462 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysRoleDept.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.intc.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysRoleMenu.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysRoleMenu.java index de10a74..7c15495 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.intc.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysScreenLocation.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysScreenLocation.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysScreenLocation.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysScreenLocation.java index bf7e0e7..d9d38c3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysScreenLocation.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysScreenLocation.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.domain; +package com.intc.system.domain; 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.web.domain.BaseEntity; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysScreenModule.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysScreenModule.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysScreenModule.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysScreenModule.java index b3c7bf9..06007b1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysScreenModule.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysScreenModule.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.domain; +package com.intc.system.domain; -import com.ruoyi.common.core.web.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUserOnline.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUserOnline.java index 69bac9a..10bf3c9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUserOnline.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.intc.system.domain; /** * 当前在线会话 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUserPost.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUserPost.java index 6e8c416..d772f45 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUserPost.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.intc.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUserRole.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUserRole.java index 4d15810..78f5bce 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/SysUserRole.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.intc.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SysScreenLocationDto.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/dto/SysScreenLocationDto.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SysScreenLocationDto.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/dto/SysScreenLocationDto.java index 9370488..e2c6816 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SysScreenLocationDto.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/dto/SysScreenLocationDto.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.dto; +package com.intc.system.domain.dto; import lombok.Data; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/MetaVo.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/MetaVo.java index 53bb9f6..ed01a6a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/MetaVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.domain.vo; +package com.intc.system.domain.vo; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; /** * 路由显示信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/RouterVo.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/RouterVo.java index afff8c9..08c09f3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/RouterVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.vo; +package com.intc.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysScreenLocationVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysScreenLocationVo.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysScreenLocationVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysScreenLocationVo.java index 8e89e1f..5fac9d0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysScreenLocationVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysScreenLocationVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.domain.vo; +package com.intc.system.domain.vo; -import com.ruoyi.system.domain.SysScreenLocation; +import com.intc.system.domain.SysScreenLocation; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysScreenModuleVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysScreenModuleVo.java similarity index 77% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysScreenModuleVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysScreenModuleVo.java index cc70431..0e8a722 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysScreenModuleVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysScreenModuleVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.domain.vo; +package com.intc.system.domain.vo; -import com.ruoyi.system.domain.SysScreenModule; +import com.intc.system.domain.SysScreenModule; import lombok.Data; import io.swagger.annotations.ApiModel; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysUserVo.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysUserVo.java index 4e23e90..6c057a7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/SysUserVo.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.domain.vo; +package com.intc.system.domain.vo; -import com.ruoyi.common.core.annotation.Excel; -import com.ruoyi.system.api.domain.SysUser; +import com.intc.common.core.annotation.Excel; +import com.intc.system.api.domain.SysUser; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/TreeSelect.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java rename to intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/TreeSelect.java index cc542ef..e84c9e8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/domain/vo/TreeSelect.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.domain.vo; +package com.intc.system.domain.vo; import java.io.Serializable; import java.util.List; import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonInclude; -import com.ruoyi.system.api.domain.SysDept; -import com.ruoyi.system.domain.SysMenu; +import com.intc.system.api.domain.SysDept; +import com.intc.system.domain.SysMenu; /** * Treeselect树结构实体类 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysConfigMapper.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysConfigMapper.java index 69f1ac5..70b4b03 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysConfigMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.intc.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysConfig; +import com.intc.system.domain.SysConfig; /** * 参数配置 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysDeptMapper.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysDeptMapper.java index 77e7e83..15e2a8b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysDeptMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.mapper; +package com.intc.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.api.domain.SysDept; +import com.intc.system.api.domain.SysDept; /** * 部门管理 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysDictDataMapper.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysDictDataMapper.java index b004c59..f0c7d5a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysDictDataMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.mapper; +package com.intc.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.api.domain.SysDictData; +import com.intc.system.api.domain.SysDictData; /** * 字典表 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysDictTypeMapper.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysDictTypeMapper.java index d217293..328e556 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysDictTypeMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.intc.system.mapper; import java.util.List; -import com.ruoyi.system.api.domain.SysDictType; +import com.intc.system.api.domain.SysDictType; /** * 字典表 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysLogininforMapper.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysLogininforMapper.java index 19671f3..c0f4626 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysLogininforMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.intc.system.mapper; import java.util.List; -import com.ruoyi.system.api.domain.SysLogininfor; +import com.intc.system.api.domain.SysLogininfor; /** * 系统访问日志情况信息 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysMenuMapper.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysMenuMapper.java index 3302010..3fa9408 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysMenuMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.mapper; +package com.intc.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.domain.SysMenu; +import com.intc.system.domain.SysMenu; /** * 菜单表 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysNoticeMapper.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysNoticeMapper.java index 226fdab..0bbfed9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysNoticeMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.intc.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysNotice; +import com.intc.system.domain.SysNotice; /** * 通知公告表 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysOperLogMapper.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysOperLogMapper.java index f243dcd..ec2c763 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysOperLogMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.intc.system.mapper; import java.util.List; -import com.ruoyi.system.api.domain.SysOperLog; +import com.intc.system.api.domain.SysOperLog; /** * 操作日志 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysPostMapper.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysPostMapper.java index 19be227..cfd009d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysPostMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.intc.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysPost; +import com.intc.system.domain.SysPost; /** * 岗位信息 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysRoleDeptMapper.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysRoleDeptMapper.java index f9d3a2f..d85e4ba 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysRoleDeptMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.intc.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysRoleDept; +import com.intc.system.domain.SysRoleDept; /** * 角色与部门关联表 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysRoleMapper.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysRoleMapper.java index 1ef156f..5d488f6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysRoleMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.intc.system.mapper; import java.util.List; -import com.ruoyi.system.api.domain.SysRole; +import com.intc.system.api.domain.SysRole; /** * 角色表 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysRoleMenuMapper.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysRoleMenuMapper.java index 6602bee..8e35f14 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysRoleMenuMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.intc.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysRoleMenu; +import com.intc.system.domain.SysRoleMenu; /** * 角色与菜单关联表 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysScreenLocationMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysScreenLocationMapper.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysScreenLocationMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysScreenLocationMapper.java index 786ba74..06a7b8c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysScreenLocationMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysScreenLocationMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.mapper; +package com.intc.system.mapper; -import com.ruoyi.system.domain.SysScreenLocation; -import com.ruoyi.system.domain.dto.SysScreenLocationDto; -import com.ruoyi.system.domain.vo.SysScreenLocationVo; -import com.ruoyi.system.domain.vo.SysScreenModuleVo; +import com.intc.system.domain.SysScreenLocation; +import com.intc.system.domain.dto.SysScreenLocationDto; +import com.intc.system.domain.vo.SysScreenLocationVo; +import com.intc.system.domain.vo.SysScreenModuleVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysUserMapper.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysUserMapper.java index 4974a51..9975103 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysUserMapper.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.mapper; +package com.intc.system.mapper; import java.util.List; -import com.ruoyi.system.domain.vo.SysUserVo; +import com.intc.system.domain.vo.SysUserVo; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.api.domain.SysUser; +import com.intc.system.api.domain.SysUser; /** * 用户表 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysUserPostMapper.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysUserPostMapper.java index e08991d..da4b8b2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysUserPostMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.intc.system.mapper; import java.util.List; -import com.ruoyi.system.domain.SysUserPost; +import com.intc.system.domain.SysUserPost; /** * 用户与岗位关联表 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysUserRoleMapper.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java rename to intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysUserRoleMapper.java index 3143ec8..f281d68 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/mapper/SysUserRoleMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.mapper; +package com.intc.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.system.domain.SysUserRole; +import com.intc.system.domain.SysUserRole; /** * 用户与角色关联表 数据层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysConfigService.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysConfigService.java index 52a3b00..1223db2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysConfigService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.intc.system.service; import java.util.List; -import com.ruoyi.system.domain.SysConfig; +import com.intc.system.domain.SysConfig; /** * 参数配置 服务层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDeptService.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDeptService.java index 313d577..8120feb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDeptService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.intc.system.service; import java.util.List; -import com.ruoyi.system.api.domain.SysDept; -import com.ruoyi.system.domain.vo.TreeSelect; +import com.intc.system.api.domain.SysDept; +import com.intc.system.domain.vo.TreeSelect; /** * 部门管理 服务层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDictDataService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDictDataService.java index ba9d8ea..dbcbdd9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDictDataService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.intc.system.service; import java.util.List; -import com.ruoyi.system.api.domain.SysDictData; +import com.intc.system.api.domain.SysDictData; /** * 字典 业务层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDictTypeService.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDictTypeService.java index ceb80e7..3415cf1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysDictTypeService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.intc.system.service; import java.util.List; -import com.ruoyi.system.api.domain.SysDictData; -import com.ruoyi.system.api.domain.SysDictType; +import com.intc.system.api.domain.SysDictData; +import com.intc.system.api.domain.SysDictType; /** * 字典 业务层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysLogininforService.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysLogininforService.java index 509cc54..12d8a58 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysLogininforService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.intc.system.service; import java.util.List; -import com.ruoyi.system.api.domain.SysLogininfor; +import com.intc.system.api.domain.SysLogininfor; /** * 系统访问日志情况信息 服务层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysMenuService.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysMenuService.java index 4de9419..7d9efb6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysMenuService.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.service; +package com.intc.system.service; import java.util.List; import java.util.Set; -import com.ruoyi.system.domain.SysMenu; -import com.ruoyi.system.domain.vo.RouterVo; -import com.ruoyi.system.domain.vo.TreeSelect; +import com.intc.system.domain.SysMenu; +import com.intc.system.domain.vo.RouterVo; +import com.intc.system.domain.vo.TreeSelect; /** * 菜单 业务层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysNoticeService.java similarity index 93% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysNoticeService.java index 47ce1b7..43b0577 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysNoticeService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.intc.system.service; import java.util.List; -import com.ruoyi.system.domain.SysNotice; +import com.intc.system.domain.SysNotice; /** * 公告 服务层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysOperLogService.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysOperLogService.java index 2178a9d..7eb035b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysOperLogService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.intc.system.service; import java.util.List; -import com.ruoyi.system.api.domain.SysOperLog; +import com.intc.system.api.domain.SysOperLog; /** * 操作日志 服务层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysPermissionService.java similarity index 85% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysPermissionService.java index 230f9b2..7829cac 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysPermissionService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.intc.system.service; import java.util.Set; -import com.ruoyi.system.api.domain.SysUser; +import com.intc.system.api.domain.SysUser; /** * 权限信息 服务层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysPostService.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysPostService.java index 84779bf..a640dfe 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysPostService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.intc.system.service; import java.util.List; -import com.ruoyi.system.domain.SysPost; +import com.intc.system.domain.SysPost; /** * 岗位信息 服务层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysRoleService.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysRoleService.java index fe791ef..40a49eb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysRoleService.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.service; +package com.intc.system.service; import java.util.List; import java.util.Set; -import com.ruoyi.system.api.domain.SysRole; -import com.ruoyi.system.domain.SysUserRole; +import com.intc.system.api.domain.SysRole; +import com.intc.system.domain.SysUserRole; /** * 角色业务层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysScreenLocationService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysScreenLocationService.java similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysScreenLocationService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysScreenLocationService.java index 391ddfc..d249a38 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysScreenLocationService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysScreenLocationService.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.service; +package com.intc.system.service; import java.util.List; -import com.ruoyi.system.domain.SysScreenLocation; -import com.ruoyi.system.domain.dto.SysScreenLocationDto; -import com.ruoyi.system.domain.vo.SysScreenLocationVo; -import com.ruoyi.system.domain.vo.SysScreenModuleVo; +import com.intc.system.domain.SysScreenLocation; +import com.intc.system.domain.dto.SysScreenLocationDto; +import com.intc.system.domain.vo.SysScreenLocationVo; +import com.intc.system.domain.vo.SysScreenModuleVo; /** * 大屏模块位置Service接口 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysUserOnlineService.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysUserOnlineService.java index 9ca0ac4..8e6db46 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysUserOnlineService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.intc.system.service; -import com.ruoyi.system.api.model.LoginUser; -import com.ruoyi.system.domain.SysUserOnline; +import com.intc.system.api.model.LoginUser; +import com.intc.system.domain.SysUserOnline; /** * 在线用户 服务层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysUserService.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/ISysUserService.java index 6a0e559..af0e146 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/ISysUserService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.intc.system.service; import java.util.List; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.domain.vo.SysUserVo; +import com.intc.system.api.domain.SysUser; +import com.intc.system.domain.vo.SysUserVo; /** * 用户 业务层 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysConfigServiceImpl.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysConfigServiceImpl.java index 39c8f89..211c384 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysConfigServiceImpl.java @@ -1,19 +1,19 @@ -package com.ruoyi.system.service.impl; +package com.intc.system.service.impl; import java.util.Collection; import java.util.List; import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.constant.CacheConstants; -import com.ruoyi.common.core.constant.UserConstants; -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.redis.service.RedisService; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.mapper.SysConfigMapper; -import com.ruoyi.system.service.ISysConfigService; +import com.intc.common.core.constant.CacheConstants; +import com.intc.common.core.constant.UserConstants; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.text.Convert; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.redis.service.RedisService; +import com.intc.system.domain.SysConfig; +import com.intc.system.mapper.SysConfigMapper; +import com.intc.system.service.ISysConfigService; /** * 参数配置 服务层实现 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDeptServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDeptServiceImpl.java index d6e9722..0008235 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDeptServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.intc.system.service.impl; import java.util.ArrayList; import java.util.Iterator; @@ -6,20 +6,20 @@ import java.util.List; import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysDept; -import com.ruoyi.system.api.domain.SysRole; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.domain.vo.TreeSelect; -import com.ruoyi.system.mapper.SysDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.service.ISysDeptService; +import com.intc.common.core.constant.UserConstants; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.text.Convert; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.api.domain.SysDept; +import com.intc.system.api.domain.SysRole; +import com.intc.system.api.domain.SysUser; +import com.intc.system.domain.vo.TreeSelect; +import com.intc.system.mapper.SysDeptMapper; +import com.intc.system.mapper.SysRoleMapper; +import com.intc.system.service.ISysDeptService; /** * 部门管理 服务实现 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDictDataServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDictDataServiceImpl.java index a40666f..810799c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDictDataServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service.impl; +package com.intc.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.security.utils.DictUtils; -import com.ruoyi.system.api.domain.SysDictData; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.service.ISysDictDataService; +import com.intc.common.security.utils.DictUtils; +import com.intc.system.api.domain.SysDictData; +import com.intc.system.mapper.SysDictDataMapper; +import com.intc.system.service.ISysDictDataService; /** * 字典 业务层处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDictTypeServiceImpl.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDictTypeServiceImpl.java index 1ac0925..0710c42 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysDictTypeServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.intc.system.service.impl; import java.util.Comparator; import java.util.List; @@ -8,15 +8,15 @@ import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.DictUtils; -import com.ruoyi.system.api.domain.SysDictData; -import com.ruoyi.system.api.domain.SysDictType; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.mapper.SysDictTypeMapper; -import com.ruoyi.system.service.ISysDictTypeService; +import com.intc.common.core.constant.UserConstants; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.utils.DictUtils; +import com.intc.system.api.domain.SysDictData; +import com.intc.system.api.domain.SysDictType; +import com.intc.system.mapper.SysDictDataMapper; +import com.intc.system.mapper.SysDictTypeMapper; +import com.intc.system.service.ISysDictTypeService; /** * 字典 业务层处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysLogininforServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysLogininforServiceImpl.java index ba53b22..06e5edc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysLogininforServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.service.impl; +package com.intc.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.api.domain.SysLogininfor; -import com.ruoyi.system.mapper.SysLogininforMapper; -import com.ruoyi.system.service.ISysLogininforService; +import com.intc.system.api.domain.SysLogininfor; +import com.intc.system.mapper.SysLogininforMapper; +import com.intc.system.service.ISysLogininforService; /** * 系统访问日志情况信息 服务层处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysMenuServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysMenuServiceImpl.java index 34ef0a1..a39efef 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysMenuServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.intc.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -10,20 +10,20 @@ import java.util.Set; import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.constant.Constants; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysRole; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.domain.SysMenu; -import com.ruoyi.system.domain.vo.MetaVo; -import com.ruoyi.system.domain.vo.RouterVo; -import com.ruoyi.system.domain.vo.TreeSelect; -import com.ruoyi.system.mapper.SysMenuMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.service.ISysMenuService; +import com.intc.common.core.constant.Constants; +import com.intc.common.core.constant.UserConstants; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.api.domain.SysRole; +import com.intc.system.api.domain.SysUser; +import com.intc.system.domain.SysMenu; +import com.intc.system.domain.vo.MetaVo; +import com.intc.system.domain.vo.RouterVo; +import com.intc.system.domain.vo.TreeSelect; +import com.intc.system.mapper.SysMenuMapper; +import com.intc.system.mapper.SysRoleMapper; +import com.intc.system.mapper.SysRoleMenuMapper; +import com.intc.system.service.ISysMenuService; /** * 菜单 业务层处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysNoticeServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysNoticeServiceImpl.java index 765438b..4ac7f1c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysNoticeServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.service.impl; +package com.intc.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.mapper.SysNoticeMapper; -import com.ruoyi.system.service.ISysNoticeService; +import com.intc.system.domain.SysNotice; +import com.intc.system.mapper.SysNoticeMapper; +import com.intc.system.service.ISysNoticeService; /** * 公告 服务层实现 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysOperLogServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysOperLogServiceImpl.java index 232810f..b808282 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysOperLogServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.service.impl; +package com.intc.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.api.domain.SysOperLog; -import com.ruoyi.system.mapper.SysOperLogMapper; -import com.ruoyi.system.service.ISysOperLogService; +import com.intc.system.api.domain.SysOperLog; +import com.intc.system.mapper.SysOperLogMapper; +import com.intc.system.service.ISysOperLogService; /** * 操作日志 服务层处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysPermissionServiceImpl.java similarity index 87% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysPermissionServiceImpl.java index 6925967..c73913a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysPermissionServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.service.impl; +package com.intc.system.service.impl; import java.util.HashSet; import java.util.List; import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.system.api.domain.SysRole; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.service.ISysMenuService; -import com.ruoyi.system.service.ISysPermissionService; -import com.ruoyi.system.service.ISysRoleService; +import com.intc.system.api.domain.SysRole; +import com.intc.system.api.domain.SysUser; +import com.intc.system.service.ISysMenuService; +import com.intc.system.service.ISysPermissionService; +import com.intc.system.service.ISysRoleService; /** * 用户权限处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysPostServiceImpl.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysPostServiceImpl.java index 4148380..796404e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysPostServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.service.impl; +package com.intc.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.service.ISysPostService; +import com.intc.common.core.constant.UserConstants; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.StringUtils; +import com.intc.system.domain.SysPost; +import com.intc.system.mapper.SysPostMapper; +import com.intc.system.mapper.SysUserPostMapper; +import com.intc.system.service.ISysPostService; /** * 岗位信息 服务层处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysRoleServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysRoleServiceImpl.java index 8b34e5c..bf7bb7c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.intc.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -8,22 +8,22 @@ import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysRole; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.domain.SysRoleDept; -import com.ruoyi.system.domain.SysRoleMenu; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysRoleDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; -import com.ruoyi.system.service.ISysRoleService; +import com.intc.common.core.constant.UserConstants; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.api.domain.SysRole; +import com.intc.system.api.domain.SysUser; +import com.intc.system.domain.SysRoleDept; +import com.intc.system.domain.SysRoleMenu; +import com.intc.system.domain.SysUserRole; +import com.intc.system.mapper.SysRoleDeptMapper; +import com.intc.system.mapper.SysRoleMapper; +import com.intc.system.mapper.SysRoleMenuMapper; +import com.intc.system.mapper.SysUserRoleMapper; +import com.intc.system.service.ISysRoleService; /** * 角色 业务层处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysScreenLocationServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysScreenLocationServiceImpl.java similarity index 84% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysScreenLocationServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysScreenLocationServiceImpl.java index cb722e4..0b1b81f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysScreenLocationServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysScreenLocationServiceImpl.java @@ -1,14 +1,14 @@ -package com.ruoyi.system.service.impl; +package com.intc.system.service.impl; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.domain.SysScreenLocation; -import com.ruoyi.system.domain.dto.SysScreenLocationDto; -import com.ruoyi.system.domain.vo.SysScreenLocationVo; -import com.ruoyi.system.domain.vo.SysScreenModuleVo; -import com.ruoyi.system.mapper.SysScreenLocationMapper; -import com.ruoyi.system.service.ISysScreenLocationService; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.domain.SysScreenLocation; +import com.intc.system.domain.dto.SysScreenLocationDto; +import com.intc.system.domain.vo.SysScreenLocationVo; +import com.intc.system.domain.vo.SysScreenModuleVo; +import com.intc.system.mapper.SysScreenLocationMapper; +import com.intc.system.service.ISysScreenLocationService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysUserOnlineServiceImpl.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysUserOnlineServiceImpl.java index 046b6fd..dd5e9ed 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.service.impl; +package com.intc.system.service.impl; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.system.api.model.LoginUser; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.intc.common.core.utils.StringUtils; +import com.intc.system.api.model.LoginUser; +import com.intc.system.domain.SysUserOnline; +import com.intc.system.service.ISysUserOnlineService; /** * 在线用户 服务层处理 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysUserServiceImpl.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java rename to intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysUserServiceImpl.java index fdd093d..13caff9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/intc-modules/intc-system/src/main/java/com/intc/system/service/impl/SysUserServiceImpl.java @@ -1,24 +1,24 @@ -package com.ruoyi.system.service.impl; +package com.intc.system.service.impl; -import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.exception.ServiceException; -import com.ruoyi.common.core.utils.DateUtils; -import com.ruoyi.common.core.utils.IdWorker; -import com.ruoyi.common.core.utils.SpringUtils; -import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.core.utils.bean.BeanValidators; -import com.ruoyi.common.datascope.annotation.DataScope; -import com.ruoyi.common.security.utils.SecurityUtils; -import com.ruoyi.system.api.domain.SysRole; -import com.ruoyi.system.api.domain.SysUser; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.domain.SysScreenLocation; -import com.ruoyi.system.domain.SysUserPost; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.domain.vo.SysUserVo; -import com.ruoyi.system.mapper.*; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysUserService; +import com.intc.common.core.constant.UserConstants; +import com.intc.common.core.exception.ServiceException; +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.core.utils.SpringUtils; +import com.intc.common.core.utils.StringUtils; +import com.intc.common.core.utils.bean.BeanValidators; +import com.intc.common.datascope.annotation.DataScope; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.system.api.domain.SysRole; +import com.intc.system.api.domain.SysUser; +import com.intc.system.domain.SysPost; +import com.intc.system.domain.SysScreenLocation; +import com.intc.system.domain.SysUserPost; +import com.intc.system.domain.SysUserRole; +import com.intc.system.domain.vo.SysUserVo; +import com.intc.system.mapper.*; +import com.intc.system.service.ISysConfigService; +import com.intc.system.service.ISysUserService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/banner.txt b/intc-modules/intc-system/src/main/resources/banner.txt similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/banner.txt rename to intc-modules/intc-system/src/main/resources/banner.txt diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/intc-modules/intc-system/src/main/resources/bootstrap.yml similarity index 86% rename from ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml rename to intc-modules/intc-system/src/main/resources/bootstrap.yml index 2cbe684..b4341b8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/intc-modules/intc-system/src/main/resources/bootstrap.yml @@ -9,7 +9,7 @@ server: spring: application: # 应用名称 - name: ruoyi-system + name: intc-system profiles: # 环境配置 active: dev @@ -21,13 +21,13 @@ spring: cloud: nacos: discovery: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 服务注册地址 server-addr: 101.126.95.100:8858 group: intc ip: 154.8.147.51 config: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 配置中心地址 server-addr: 101.126.95.100:8858 # 配置文件格式 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/db/migration/V20230315173120__empty.sql b/intc-modules/intc-system/src/main/resources/db/migration/V20230315173120__empty.sql similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/db/migration/V20230315173120__empty.sql rename to intc-modules/intc-system/src/main/resources/db/migration/V20230315173120__empty.sql diff --git a/intc-modules/intc-system/src/main/resources/logback.xml b/intc-modules/intc-system/src/main/resources/logback.xml new file mode 100644 index 0000000..30bd067 --- /dev/null +++ b/intc-modules/intc-system/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysConfigMapper.xml index dc8c929..0f1cef9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysDeptMapper.xml index f2a8353..50f253b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysDictDataMapper.xml index c8df848..7c01d82 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index de6f607..f0a860b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 9f23c59..1c0e46e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysMenuMapper.xml index b215d86..a132285 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysNoticeMapper.xml index df9abe3..a9e70a0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 09b0da4..185a27b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysPostMapper.xml index 2bc3616..dd25a73 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml index 7c4139b..f7c0636 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysRoleMapper.xml index c284d33..3393519 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index cb60a85..a286244 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysScreenLocationMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysScreenLocationMapper.xml similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysScreenLocationMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysScreenLocationMapper.xml index 43a0220..32b5582 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysScreenLocationMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysScreenLocationMapper.xml @@ -2,7 +2,7 @@ - + @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ssm.id, ssm.description, ssm.name, ssm.icon, ssm.sequence,ssm.status, ssm.type from sys_screen_module ssm - diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysUserMapper.xml index 92de0e4..8cba4db 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -2,7 +2,7 @@ - + @@ -221,7 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT (select string_agg(a.post_name, ',') from (select post_name from sys_user_post sup diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 2b90bc4..266d22d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/intc-modules/intc-system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to intc-modules/intc-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index dd72689..4122ba3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/intc-modules/intc-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-modules/intc-weixin/README.md b/intc-modules/intc-weixin/README.md similarity index 100% rename from ruoyi-modules/intc-weixin/README.md rename to intc-modules/intc-weixin/README.md diff --git a/ruoyi-modules/intc-weixin/pom.xml b/intc-modules/intc-weixin/pom.xml similarity index 93% rename from ruoyi-modules/intc-weixin/pom.xml rename to intc-modules/intc-weixin/pom.xml index f6d2720..0ab48b4 100644 --- a/ruoyi-modules/intc-weixin/pom.xml +++ b/intc-modules/intc-weixin/pom.xml @@ -3,8 +3,8 @@ 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"> - com.ruoyi - ruoyi-modules + com.intc + intc-modules 3.6.3 4.0.0 @@ -65,15 +65,15 @@ - com.ruoyi - ruoyi-common-datasource + com.intc + intc-common-datasource 3.6.3 - com.ruoyi - ruoyi-common-datascope + com.intc + intc-common-datascope 3.6.3 @@ -91,14 +91,14 @@ - com.ruoyi - ruoyi-common-log + com.intc + intc-common-log - com.ruoyi - ruoyi-common-swagger + com.intc + intc-common-swagger ws.schild diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/IntcWeixinApplication.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/IntcWeixinApplication.java similarity index 71% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/IntcWeixinApplication.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/IntcWeixinApplication.java index ea17975..873ebfe 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/IntcWeixinApplication.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/IntcWeixinApplication.java @@ -1,10 +1,10 @@ -package com.ruoyi; +package com.intc; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import com.ruoyi.common.security.annotation.EnableCustomConfig; -import com.ruoyi.common.security.annotation.EnableRyFeignClients; -import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; +import com.intc.common.security.annotation.EnableCustomConfig; +import com.intc.common.security.annotation.EnableRyFeignClients; +import com.intc.common.swagger.annotation.EnableCustomSwagger2; /** * 系统模块 diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/config/ActuatorSecurityConfig.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/config/ActuatorSecurityConfig.java similarity index 94% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/config/ActuatorSecurityConfig.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/config/ActuatorSecurityConfig.java index 05433e1..04d6411 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/config/ActuatorSecurityConfig.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/config/ActuatorSecurityConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.config; +package com.intc.config; -import com.ruoyi.common.core.utils.StringUtils; +import com.intc.common.core.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/builder/AbstractBuilder.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/builder/AbstractBuilder.java similarity index 97% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/builder/AbstractBuilder.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/builder/AbstractBuilder.java index 4b5ca58..d9fef23 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/builder/AbstractBuilder.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/builder/AbstractBuilder.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.builder; +package com.intc.weixin.builder; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/builder/ImageBuilder.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/builder/ImageBuilder.java similarity index 98% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/builder/ImageBuilder.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/builder/ImageBuilder.java index 9eefca8..a6ebd21 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/builder/ImageBuilder.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/builder/ImageBuilder.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.builder; +package com.intc.weixin.builder; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/builder/TextBuilder.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/builder/TextBuilder.java similarity index 98% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/builder/TextBuilder.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/builder/TextBuilder.java index 470ff0e..2dff4b2 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/builder/TextBuilder.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/builder/TextBuilder.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.builder; +package com.intc.weixin.builder; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/CommonConstants.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/CommonConstants.java similarity index 97% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/CommonConstants.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/CommonConstants.java index f1ca61a..e4da1b3 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/CommonConstants.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/CommonConstants.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.config; +package com.intc.weixin.config; /** * @author diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WebConfig.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WebConfig.java similarity index 91% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WebConfig.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WebConfig.java index 9563332..e453e63 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WebConfig.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WebConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.weixin.config; +package com.intc.weixin.config; -import com.ruoyi.weixin.interceptor.ThirdSessionInterceptor; +import com.intc.weixin.interceptor.ThirdSessionInterceptor; import lombok.AllArgsConstructor; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.core.RedisTemplate; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMaConfiguration.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMaConfiguration.java similarity index 93% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMaConfiguration.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMaConfiguration.java index efe95d6..90e4427 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMaConfiguration.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMaConfiguration.java @@ -1,4 +1,4 @@ -package com.ruoyi.weixin.config; +package com.intc.weixin.config; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; @@ -27,15 +27,15 @@ import java.util.stream.Collectors; */ @Slf4j @Configuration -@EnableConfigurationProperties(com.ruoyi.weixin.config.WxMaProperties.class) +@EnableConfigurationProperties(com.intc.weixin.config.WxMaProperties.class) public class WxMaConfiguration { - private final com.ruoyi.weixin.config.WxMaProperties properties; + private final com.intc.weixin.config.WxMaProperties properties; private static final Map routers = Maps.newHashMap(); private static Map maServices; @Autowired - public WxMaConfiguration(com.ruoyi.weixin.config.WxMaProperties properties) { + public WxMaConfiguration(com.intc.weixin.config.WxMaProperties properties) { this.properties = properties; } @@ -54,7 +54,7 @@ public class WxMaConfiguration { @PostConstruct public void init() { - List configs = this.properties.getConfigs(); + List configs = this.properties.getConfigs(); if (configs == null) { throw new RuntimeException("大哥，拜托先看下项目首页的说明（readme文件），添加下相关配置，注意别配错了！"); } diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMaProperties.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMaProperties.java similarity index 98% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMaProperties.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMaProperties.java index 750873f..637746e 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMaProperties.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMaProperties.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.config; +package com.intc.weixin.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMpConfiguration.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMpConfiguration.java similarity index 98% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMpConfiguration.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMpConfiguration.java index d17e967..265f132 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMpConfiguration.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMpConfiguration.java @@ -21,9 +21,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.config; +package com.intc.weixin.config; -import com.ruoyi.weixin.handler.*; +import com.intc.weixin.handler.*; import lombok.AllArgsConstructor; import me.chanjar.weixin.mp.api.WxMpMessageRouter; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMpProperties.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMpProperties.java similarity index 96% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMpProperties.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMpProperties.java index f5171dd..f490167 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMpProperties.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxMpProperties.java @@ -21,9 +21,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.config; +package com.intc.weixin.config; -import com.ruoyi.weixin.utils.JsonUtils; +import com.intc.weixin.utils.JsonUtils; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxPayConfiguration.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxPayConfiguration.java similarity index 97% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxPayConfiguration.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxPayConfiguration.java index dab45a9..248e80a 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxPayConfiguration.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/config/WxPayConfiguration.java @@ -4,7 +4,7 @@ * 注意： * 本软件为www.joolun.com开发研制，项目使用请保留此说明 */ -package com.ruoyi.weixin.config; +package com.intc.weixin.config; import cn.hutool.core.util.StrUtil; import com.github.binarywang.wxpay.config.WxPayConfig; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/ConfigConstant.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/ConfigConstant.java similarity index 98% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/ConfigConstant.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/ConfigConstant.java index 9d3f3d0..7b750bb 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/ConfigConstant.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/ConfigConstant.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.constant; +package com.intc.weixin.constant; /** * 全局常量 diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/MyReturnCode.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/MyReturnCode.java similarity index 98% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/MyReturnCode.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/MyReturnCode.java index 9adb5c6..9a75ccc 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/MyReturnCode.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/MyReturnCode.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.constant; +package com.intc.weixin.constant; /** * 全局返回码 diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/WebSocketConstant.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/WebSocketConstant.java similarity index 97% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/WebSocketConstant.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/WebSocketConstant.java index 5f93971..8d7b224 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/WebSocketConstant.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/WebSocketConstant.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.constant; +package com.intc.weixin.constant; /** * @author www.joolun.com diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/WxMaConstants.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/WxMaConstants.java similarity index 97% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/WxMaConstants.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/WxMaConstants.java index 63ab32a..27cbd90 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/WxMaConstants.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/WxMaConstants.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.constant; +package com.intc.weixin.constant; /** * @author diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/WxReturnCode.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/WxReturnCode.java similarity index 99% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/WxReturnCode.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/WxReturnCode.java index cf466b1..26f962a 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/WxReturnCode.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/constant/WxReturnCode.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.constant; +package com.intc.weixin.constant; /** * 微信接口全局返回码 diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WeChatController.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WeChatController.java similarity index 95% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WeChatController.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WeChatController.java index 0c45e8e..ce442d6 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WeChatController.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WeChatController.java @@ -1,6 +1,6 @@ -package com.ruoyi.weixin.controller; +package com.intc.weixin.controller; -import com.ruoyi.weixin.utils.CheckUtil; +import com.intc.weixin.utils.CheckUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxAutoReplyController.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxAutoReplyController.java similarity index 92% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxAutoReplyController.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxAutoReplyController.java index 54675b2..24354d2 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxAutoReplyController.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxAutoReplyController.java @@ -21,17 +21,17 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.controller; +package com.intc.weixin.controller; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.weixin.constant.ConfigConstant; -import com.ruoyi.weixin.entity.WxAutoReply; -import com.ruoyi.weixin.service.WxAutoReplyService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.weixin.constant.ConfigConstant; +import com.intc.weixin.entity.WxAutoReply; +import com.intc.weixin.service.WxAutoReplyService; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxDraftController.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxDraftController.java similarity index 95% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxDraftController.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxDraftController.java index 42d02b6..cadd0be 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxDraftController.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxDraftController.java @@ -21,14 +21,14 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.controller; +package com.intc.weixin.controller; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.security.annotation.RequiresPermissions; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.mp.api.WxMpDraftService; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxFreePublishController.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxFreePublishController.java similarity index 92% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxFreePublishController.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxFreePublishController.java index 8f624cb..cc62821 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxFreePublishController.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxFreePublishController.java @@ -21,12 +21,12 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.controller; +package com.intc.weixin.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.security.annotation.RequiresPermissions; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.mp.api.WxMpFreePublishService; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxMaterialController.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxMaterialController.java similarity index 96% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxMaterialController.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxMaterialController.java index 5c093ee..3ddbb6d 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxMaterialController.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxMaterialController.java @@ -21,15 +21,15 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.controller; +package com.intc.weixin.controller; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.weixin.entity.ImageManager; -import com.ruoyi.weixin.utils.FileUtils; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.weixin.entity.ImageManager; +import com.intc.weixin.utils.FileUtils; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.api.WxConsts; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxMenuController.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxMenuController.java similarity index 90% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxMenuController.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxMenuController.java index c66c719..b127c0f 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxMenuController.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxMenuController.java @@ -21,14 +21,14 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.controller; +package com.intc.weixin.controller; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.weixin.service.WxMenuService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.weixin.service.WxMenuService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxMsgController.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxMsgController.java similarity index 93% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxMsgController.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxMsgController.java index 87632f4..6a4aeb0 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxMsgController.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxMsgController.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.controller; +package com.intc.weixin.controller; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; @@ -29,16 +29,16 @@ import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.weixin.config.CommonConstants; -import com.ruoyi.weixin.constant.ConfigConstant; -import com.ruoyi.weixin.entity.WxMsg; -import com.ruoyi.weixin.entity.WxMsgVO; -import com.ruoyi.weixin.entity.WxUser; -import com.ruoyi.weixin.service.WxMsgService; -import com.ruoyi.weixin.service.WxUserService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.weixin.config.CommonConstants; +import com.intc.weixin.constant.ConfigConstant; +import com.intc.weixin.entity.WxMsg; +import com.intc.weixin.entity.WxMsgVO; +import com.intc.weixin.entity.WxUser; +import com.intc.weixin.service.WxMsgService; +import com.intc.weixin.service.WxUserService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.api.WxConsts; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxPortalController.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxPortalController.java similarity index 99% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxPortalController.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxPortalController.java index a53902e..13d601f 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxPortalController.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxPortalController.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.controller; +package com.intc.weixin.controller; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxSummaryController.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxSummaryController.java similarity index 96% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxSummaryController.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxSummaryController.java index 722e241..b9e97da 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxSummaryController.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxSummaryController.java @@ -21,11 +21,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.controller; +package com.intc.weixin.controller; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxUserController.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxUserController.java similarity index 95% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxUserController.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxUserController.java index c6e589d..e26a590 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxUserController.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxUserController.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.controller; +package com.intc.weixin.controller; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONArray; @@ -29,11 +29,11 @@ import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.weixin.entity.WxUser; -import com.ruoyi.weixin.service.WxUserService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.weixin.entity.WxUser; +import com.intc.weixin.service.WxUserService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxUserTagsController.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxUserTagsController.java similarity index 93% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxUserTagsController.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxUserTagsController.java index 288e82b..b12ddca 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxUserTagsController.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/controller/WxUserTagsController.java @@ -21,16 +21,16 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.controller; +package com.intc.weixin.controller; import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.common.core.web.controller.BaseController; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.common.security.annotation.RequiresPermissions; -import com.ruoyi.weixin.entity.WxUser; -import com.ruoyi.weixin.entity.WxUserTagsDict; -import com.ruoyi.weixin.service.WxUserService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.weixin.entity.WxUser; +import com.intc.weixin.entity.WxUserTagsDict; +import com.intc.weixin.service.WxUserService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/ImageManager.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/ImageManager.java similarity index 97% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/ImageManager.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/ImageManager.java index 2c24c70..af96ff9 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/ImageManager.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/ImageManager.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.entity; +package com.intc.weixin.entity; import lombok.Data; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/LoginMaDTO.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/LoginMaDTO.java similarity index 70% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/LoginMaDTO.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/LoginMaDTO.java index 156c288..7313a70 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/LoginMaDTO.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/LoginMaDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.weixin.entity; +package com.intc.weixin.entity; import lombok.Data; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/Menu.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/Menu.java similarity index 98% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/Menu.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/Menu.java index c2cd0af..14d61f9 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/Menu.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/Menu.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.entity; +package com.intc.weixin.entity; import cn.hutool.json.JSONUtil; import lombok.Data; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/MenuButton.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/MenuButton.java similarity index 98% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/MenuButton.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/MenuButton.java index 407a695..10b9a3c 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/MenuButton.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/MenuButton.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.entity; +package com.intc.weixin.entity; import cn.hutool.json.JSONObject; import lombok.Data; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/ThirdSession.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/ThirdSession.java similarity index 97% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/ThirdSession.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/ThirdSession.java index 1c5675e..2a9bd98 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/ThirdSession.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/ThirdSession.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.entity; +package com.intc.weixin.entity; import lombok.Data; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxAutoReply.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxAutoReply.java similarity index 97% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxAutoReply.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxAutoReply.java index 9d8408c..cd0c287 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxAutoReply.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxAutoReply.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.entity; +package com.intc.weixin.entity; import cn.hutool.json.JSONObject; @@ -30,7 +30,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; -import com.ruoyi.common.core.typehandler.JsonTypeHandler; +import com.intc.common.core.typehandler.JsonTypeHandler; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.ibatis.type.JdbcType; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxMenu.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxMenu.java similarity index 97% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxMenu.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxMenu.java index 9987386..b95836d 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxMenu.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxMenu.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.entity; +package com.intc.weixin.entity; import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.annotation.IdType; @@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; -import com.ruoyi.common.core.typehandler.JsonTypeHandler; +import com.intc.common.core.typehandler.JsonTypeHandler; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.ibatis.type.JdbcType; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxMsg.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxMsg.java similarity index 97% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxMsg.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxMsg.java index 3faa899..c0d9a0c 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxMsg.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxMsg.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.entity; +package com.intc.weixin.entity; import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.annotation.IdType; @@ -29,7 +29,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; -import com.ruoyi.common.core.typehandler.JsonTypeHandler; +import com.intc.common.core.typehandler.JsonTypeHandler; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.ibatis.type.JdbcType; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxMsgVO.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxMsgVO.java similarity index 97% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxMsgVO.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxMsgVO.java index c4b7583..06b0d94 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxMsgVO.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxMsgVO.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.entity; +package com.intc.weixin.entity; import lombok.Data; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxOpenDataDTO.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxOpenDataDTO.java similarity index 89% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxOpenDataDTO.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxOpenDataDTO.java index f7c08b5..6f9a86c 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxOpenDataDTO.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxOpenDataDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.weixin.entity; +package com.intc.weixin.entity; import lombok.Data; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxUser.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxUser.java similarity index 95% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxUser.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxUser.java index 51534ac..fcdd3c1 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxUser.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxUser.java @@ -21,16 +21,16 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.entity; +package com.intc.weixin.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; -import com.ruoyi.common.core.sensitive.Sensitive; -import com.ruoyi.common.core.sensitive.SensitiveTypeEnum; -import com.ruoyi.common.core.typehandler.ArrayLongTypeHandler; +import com.intc.common.core.sensitive.Sensitive; +import com.intc.common.core.sensitive.SensitiveTypeEnum; +import com.intc.common.core.typehandler.ArrayLongTypeHandler; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.ibatis.type.JdbcType; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxUserTagsDict.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxUserTagsDict.java similarity index 97% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxUserTagsDict.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxUserTagsDict.java index 0dac02e..0e152cb 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxUserTagsDict.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/entity/WxUserTagsDict.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.entity; +package com.intc.weixin.entity; import lombok.Data; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/AbstractHandler.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/AbstractHandler.java similarity index 97% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/AbstractHandler.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/AbstractHandler.java index 1c45e10..98ffcbf 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/AbstractHandler.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/AbstractHandler.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.handler; +package com.intc.weixin.handler; import me.chanjar.weixin.mp.api.WxMpMessageHandler; import org.slf4j.Logger; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/KfSessionHandler.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/KfSessionHandler.java similarity index 98% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/KfSessionHandler.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/KfSessionHandler.java index f611264..8e1b099 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/KfSessionHandler.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/KfSessionHandler.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.handler; +package com.intc.weixin.handler; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/LocationHandler.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/LocationHandler.java similarity index 97% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/LocationHandler.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/LocationHandler.java index 20ce731..053f8f1 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/LocationHandler.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/LocationHandler.java @@ -21,10 +21,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.handler; +package com.intc.weixin.handler; -import com.ruoyi.weixin.builder.TextBuilder; +import com.intc.weixin.builder.TextBuilder; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/LogHandler.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/LogHandler.java similarity index 95% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/LogHandler.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/LogHandler.java index 70d246e..7bebaec 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/LogHandler.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/LogHandler.java @@ -21,11 +21,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.handler; +package com.intc.weixin.handler; import cn.hutool.core.util.StrUtil; -import com.ruoyi.common.core.utils.http.HttpUtils; -import com.ruoyi.weixin.utils.JsonUtils; +import com.intc.common.core.utils.http.HttpUtils; +import com.intc.weixin.utils.JsonUtils; import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/MenuHandler.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/MenuHandler.java similarity index 95% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/MenuHandler.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/MenuHandler.java index 18ac03f..5d3c35a 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/MenuHandler.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/MenuHandler.java @@ -21,19 +21,19 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.handler; +package com.intc.weixin.handler; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.weixin.config.CommonConstants; -import com.ruoyi.weixin.constant.ConfigConstant; -import com.ruoyi.weixin.entity.WxMenu; -import com.ruoyi.weixin.entity.WxMsg; -import com.ruoyi.weixin.entity.WxUser; -import com.ruoyi.weixin.mapper.WxMenuMapper; -import com.ruoyi.weixin.mapper.WxMsgMapper; -import com.ruoyi.weixin.mapper.WxUserMapper; +import com.intc.weixin.config.CommonConstants; +import com.intc.weixin.constant.ConfigConstant; +import com.intc.weixin.entity.WxMenu; +import com.intc.weixin.entity.WxMsg; +import com.intc.weixin.entity.WxUser; +import com.intc.weixin.mapper.WxMenuMapper; +import com.intc.weixin.mapper.WxMsgMapper; +import com.intc.weixin.mapper.WxUserMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.api.WxConsts; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/MsgHandler.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/MsgHandler.java similarity index 96% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/MsgHandler.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/MsgHandler.java index 02ee80a..e07485c 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/MsgHandler.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/MsgHandler.java @@ -21,19 +21,19 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.handler; +package com.intc.weixin.handler; import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.weixin.config.CommonConstants; -import com.ruoyi.weixin.constant.ConfigConstant; -import com.ruoyi.weixin.constant.WebSocketConstant; -import com.ruoyi.weixin.entity.WxAutoReply; -import com.ruoyi.weixin.entity.WxMsg; -import com.ruoyi.weixin.entity.WxUser; -import com.ruoyi.weixin.mapper.WxUserMapper; -import com.ruoyi.weixin.service.WxAutoReplyService; -import com.ruoyi.weixin.service.WxMsgService; +import com.intc.weixin.config.CommonConstants; +import com.intc.weixin.constant.ConfigConstant; +import com.intc.weixin.constant.WebSocketConstant; +import com.intc.weixin.entity.WxAutoReply; +import com.intc.weixin.entity.WxMsg; +import com.intc.weixin.entity.WxUser; +import com.intc.weixin.mapper.WxUserMapper; +import com.intc.weixin.service.WxAutoReplyService; +import com.intc.weixin.service.WxMsgService; import lombok.AllArgsConstructor; import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.session.WxSessionManager; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/NullHandler.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/NullHandler.java similarity index 98% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/NullHandler.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/NullHandler.java index fb6bc6a..c02a84f 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/NullHandler.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/NullHandler.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.handler; +package com.intc.weixin.handler; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/ScanHandler.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/ScanHandler.java similarity index 98% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/ScanHandler.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/ScanHandler.java index 9129cab..3ff63a5 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/ScanHandler.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/ScanHandler.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.handler; +package com.intc.weixin.handler; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.session.WxSessionManager; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/StoreCheckNotifyHandler.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/StoreCheckNotifyHandler.java similarity index 98% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/StoreCheckNotifyHandler.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/StoreCheckNotifyHandler.java index da51f25..6947a89 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/StoreCheckNotifyHandler.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/StoreCheckNotifyHandler.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.handler; +package com.intc.weixin.handler; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/SubscribeHandler.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/SubscribeHandler.java similarity index 92% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/SubscribeHandler.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/SubscribeHandler.java index 25fe4cd..b89d94e 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/SubscribeHandler.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/SubscribeHandler.java @@ -21,17 +21,17 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.handler; +package com.intc.weixin.handler; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.weixin.constant.ConfigConstant; -import com.ruoyi.weixin.entity.WxAutoReply; -import com.ruoyi.weixin.entity.WxUser; -import com.ruoyi.weixin.mapper.WxUserMapper; -import com.ruoyi.weixin.service.WxAutoReplyService; -import com.ruoyi.weixin.service.WxMsgService; -import com.ruoyi.weixin.utils.LocalDateTimeUtils; +import com.intc.weixin.constant.ConfigConstant; +import com.intc.weixin.entity.WxAutoReply; +import com.intc.weixin.entity.WxUser; +import com.intc.weixin.mapper.WxUserMapper; +import com.intc.weixin.service.WxAutoReplyService; +import com.intc.weixin.service.WxMsgService; +import com.intc.weixin.utils.LocalDateTimeUtils; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.session.WxSessionManager; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/UnsubscribeHandler.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/UnsubscribeHandler.java similarity index 92% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/UnsubscribeHandler.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/UnsubscribeHandler.java index 9fbfb4b..1625c02 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/UnsubscribeHandler.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/handler/UnsubscribeHandler.java @@ -21,13 +21,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.handler; +package com.intc.weixin.handler; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.weixin.constant.ConfigConstant; -import com.ruoyi.weixin.entity.WxUser; -import com.ruoyi.weixin.mapper.WxUserMapper; -import com.ruoyi.weixin.service.WxMsgService; +import com.intc.weixin.constant.ConfigConstant; +import com.intc.weixin.entity.WxUser; +import com.intc.weixin.mapper.WxUserMapper; +import com.intc.weixin.service.WxMsgService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.session.WxSessionManager; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/interceptor/ThirdSessionInterceptor.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/interceptor/ThirdSessionInterceptor.java similarity index 85% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/interceptor/ThirdSessionInterceptor.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/interceptor/ThirdSessionInterceptor.java index 8580c22..76c448e 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/interceptor/ThirdSessionInterceptor.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/interceptor/ThirdSessionInterceptor.java @@ -1,14 +1,14 @@ -package com.ruoyi.weixin.interceptor; +package com.intc.weixin.interceptor; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; -import com.ruoyi.common.core.web.domain.AjaxResult; -import com.ruoyi.weixin.config.CommonConstants; -import com.ruoyi.weixin.constant.ConfigConstant; -import com.ruoyi.weixin.constant.MyReturnCode; -import com.ruoyi.weixin.constant.WxMaConstants; -import com.ruoyi.weixin.entity.ThirdSession; -import com.ruoyi.weixin.utils.ThirdSessionHolder; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.weixin.config.CommonConstants; +import com.intc.weixin.constant.ConfigConstant; +import com.intc.weixin.constant.MyReturnCode; +import com.intc.weixin.constant.WxMaConstants; +import com.intc.weixin.entity.ThirdSession; +import com.intc.weixin.utils.ThirdSessionHolder; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxAutoReplyMapper.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxAutoReplyMapper.java similarity index 94% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxAutoReplyMapper.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxAutoReplyMapper.java index 9dee4c8..153b4c6 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxAutoReplyMapper.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxAutoReplyMapper.java @@ -21,10 +21,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.mapper; +package com.intc.weixin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.weixin.entity.WxAutoReply; +import com.intc.weixin.entity.WxAutoReply; /** * 消息自动回复 diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxMenuMapper.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxMenuMapper.java similarity index 94% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxMenuMapper.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxMenuMapper.java index 470127c..c968837 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxMenuMapper.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxMenuMapper.java @@ -21,10 +21,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.mapper; +package com.intc.weixin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.weixin.entity.WxMenu; +import com.intc.weixin.entity.WxMenu; /** * 自定义菜单 diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxMsgMapper.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxMsgMapper.java similarity index 93% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxMsgMapper.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxMsgMapper.java index c6ed159..d1b5620 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxMsgMapper.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxMsgMapper.java @@ -21,13 +21,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.mapper; +package com.intc.weixin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.weixin.entity.WxMsg; -import com.ruoyi.weixin.entity.WxMsgVO; +import com.intc.weixin.entity.WxMsg; +import com.intc.weixin.entity.WxMsgVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxUserMapper.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxUserMapper.java similarity index 94% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxUserMapper.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxUserMapper.java index b13a481..8605900 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxUserMapper.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/mapper/WxUserMapper.java @@ -21,10 +21,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.mapper; +package com.intc.weixin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.weixin.entity.WxUser; +import com.intc.weixin.entity.WxUser; /** * 微信用户 diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxAutoReplyService.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxAutoReplyService.java similarity index 94% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxAutoReplyService.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxAutoReplyService.java index 98ae7b4..e817c3d 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxAutoReplyService.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxAutoReplyService.java @@ -21,10 +21,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.service; +package com.intc.weixin.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.weixin.entity.WxAutoReply; +import com.intc.weixin.entity.WxAutoReply; /** * 消息自动回复 diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxMenuService.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxMenuService.java similarity index 95% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxMenuService.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxMenuService.java index 72f107b..1397bfc 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxMenuService.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxMenuService.java @@ -21,10 +21,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.service; +package com.intc.weixin.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.weixin.entity.WxMenu; +import com.intc.weixin.entity.WxMenu; import me.chanjar.weixin.common.error.WxErrorException; import java.io.Serializable; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxMsgService.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxMsgService.java similarity index 93% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxMsgService.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxMsgService.java index 766577f..b6095fa 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxMsgService.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxMsgService.java @@ -21,13 +21,13 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.service; +package com.intc.weixin.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.weixin.entity.WxMsg; -import com.ruoyi.weixin.entity.WxMsgVO; +import com.intc.weixin.entity.WxMsg; +import com.intc.weixin.entity.WxMsgVO; import java.util.List; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxUserService.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxUserService.java similarity index 94% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxUserService.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxUserService.java index 84dc5d2..ffbe28f 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxUserService.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/WxUserService.java @@ -21,11 +21,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.service; +package com.intc.weixin.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.weixin.entity.WxOpenDataDTO; -import com.ruoyi.weixin.entity.WxUser; +import com.intc.weixin.entity.WxOpenDataDTO; +import com.intc.weixin.entity.WxUser; import me.chanjar.weixin.common.error.WxErrorException; /** diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxAutoReplyServiceImpl.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxAutoReplyServiceImpl.java similarity index 88% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxAutoReplyServiceImpl.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxAutoReplyServiceImpl.java index d990d20..a10f066 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxAutoReplyServiceImpl.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxAutoReplyServiceImpl.java @@ -21,12 +21,12 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.service.impl; +package com.intc.weixin.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.weixin.entity.WxAutoReply; -import com.ruoyi.weixin.mapper.WxAutoReplyMapper; -import com.ruoyi.weixin.service.WxAutoReplyService; +import com.intc.weixin.entity.WxAutoReply; +import com.intc.weixin.mapper.WxAutoReplyMapper; +import com.intc.weixin.service.WxAutoReplyService; import org.springframework.stereotype.Service; /** diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxMenuServiceImpl.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxMenuServiceImpl.java similarity index 95% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxMenuServiceImpl.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxMenuServiceImpl.java index 8c8d2cc..cfd904a 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxMenuServiceImpl.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxMenuServiceImpl.java @@ -21,16 +21,16 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.service.impl; +package com.intc.weixin.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.weixin.config.CommonConstants; -import com.ruoyi.weixin.entity.Menu; -import com.ruoyi.weixin.entity.MenuButton; -import com.ruoyi.weixin.entity.WxMenu; -import com.ruoyi.weixin.mapper.WxMenuMapper; -import com.ruoyi.weixin.service.WxMenuService; +import com.intc.weixin.config.CommonConstants; +import com.intc.weixin.entity.Menu; +import com.intc.weixin.entity.MenuButton; +import com.intc.weixin.entity.WxMenu; +import com.intc.weixin.mapper.WxMenuMapper; +import com.intc.weixin.service.WxMenuService; import lombok.AllArgsConstructor; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxMsgServiceImpl.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxMsgServiceImpl.java similarity index 88% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxMsgServiceImpl.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxMsgServiceImpl.java index bac6ab4..d36af6d 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxMsgServiceImpl.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxMsgServiceImpl.java @@ -21,15 +21,15 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.service.impl; +package com.intc.weixin.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.weixin.entity.WxMsg; -import com.ruoyi.weixin.entity.WxMsgVO; -import com.ruoyi.weixin.mapper.WxMsgMapper; -import com.ruoyi.weixin.service.WxMsgService; +import com.intc.weixin.entity.WxMsg; +import com.intc.weixin.entity.WxMsgVO; +import com.intc.weixin.mapper.WxMsgMapper; +import com.intc.weixin.service.WxMsgService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxUserServiceImpl.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxUserServiceImpl.java similarity index 95% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxUserServiceImpl.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxUserServiceImpl.java index 7876758..1767b53 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxUserServiceImpl.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/service/impl/WxUserServiceImpl.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.service.impl; +package com.intc.weixin.service.impl; import cn.binarywang.wx.miniapp.api.WxMaUserService; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; @@ -31,15 +31,15 @@ import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; -import com.ruoyi.weixin.config.WxMaConfiguration; -import com.ruoyi.weixin.constant.ConfigConstant; -import com.ruoyi.weixin.constant.WxMaConstants; -import com.ruoyi.weixin.entity.ThirdSession; -import com.ruoyi.weixin.entity.WxOpenDataDTO; -import com.ruoyi.weixin.entity.WxUser; -import com.ruoyi.weixin.handler.SubscribeHandler; -import com.ruoyi.weixin.mapper.WxUserMapper; -import com.ruoyi.weixin.service.WxUserService; +import com.intc.weixin.config.WxMaConfiguration; +import com.intc.weixin.constant.ConfigConstant; +import com.intc.weixin.constant.WxMaConstants; +import com.intc.weixin.entity.ThirdSession; +import com.intc.weixin.entity.WxOpenDataDTO; +import com.intc.weixin.entity.WxUser; +import com.intc.weixin.handler.SubscribeHandler; +import com.intc.weixin.mapper.WxUserMapper; +import com.intc.weixin.service.WxUserService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/CheckUtil.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/CheckUtil.java similarity index 95% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/CheckUtil.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/CheckUtil.java index c5be331..ac6363c 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/CheckUtil.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/CheckUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.weixin.utils; +package com.intc.weixin.utils; import java.util.Arrays; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/FileUtils.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/FileUtils.java similarity index 98% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/FileUtils.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/FileUtils.java index 2e5e2e6..a9f2a7f 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/FileUtils.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/FileUtils.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.utils; +package com.intc.weixin.utils; import cn.hutool.core.lang.UUID; import org.springframework.web.multipart.MultipartFile; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/JsonUtils.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/JsonUtils.java similarity index 97% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/JsonUtils.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/JsonUtils.java index 8ff1600..8c7b2f7 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/JsonUtils.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/JsonUtils.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.utils; +package com.intc.weixin.utils; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/LocalDateTimeUtils.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/LocalDateTimeUtils.java similarity index 99% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/LocalDateTimeUtils.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/LocalDateTimeUtils.java index f519828..2226f40 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/LocalDateTimeUtils.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/LocalDateTimeUtils.java @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.ruoyi.weixin.utils; +package com.intc.weixin.utils; import java.time.Instant; import java.time.LocalDateTime; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/SHA1.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/SHA1.java similarity index 96% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/SHA1.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/SHA1.java index 9cb077f..679942c 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/SHA1.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/SHA1.java @@ -1,4 +1,4 @@ -package com.ruoyi.weixin.utils; +package com.intc.weixin.utils; import java.security.MessageDigest; diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/ThirdSessionHolder.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/ThirdSessionHolder.java similarity index 91% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/ThirdSessionHolder.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/ThirdSessionHolder.java index e5dc011..bbed5e2 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/ThirdSessionHolder.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/ThirdSessionHolder.java @@ -1,7 +1,7 @@ -package com.ruoyi.weixin.utils; +package com.intc.weixin.utils; import com.alibaba.ttl.TransmittableThreadLocal; -import com.ruoyi.weixin.entity.ThirdSession; +import com.intc.weixin.entity.ThirdSession; import lombok.experimental.UtilityClass; /** diff --git a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/WxMaUtil.java b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/WxMaUtil.java similarity index 82% rename from ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/WxMaUtil.java rename to intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/WxMaUtil.java index 48dbd55..25571c1 100644 --- a/ruoyi-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/WxMaUtil.java +++ b/intc-modules/intc-weixin/src/main/java/com/ruoyi/weixin/utils/WxMaUtil.java @@ -1,6 +1,6 @@ -package com.ruoyi.weixin.utils; +package com.intc.weixin.utils; -import com.ruoyi.weixin.constant.ConfigConstant; +import com.intc.weixin.constant.ConfigConstant; import javax.servlet.http.HttpServletRequest; diff --git a/ruoyi-modules/intc-weixin/src/main/resources/banner.txt b/intc-modules/intc-weixin/src/main/resources/banner.txt similarity index 100% rename from ruoyi-modules/intc-weixin/src/main/resources/banner.txt rename to intc-modules/intc-weixin/src/main/resources/banner.txt diff --git a/ruoyi-modules/intc-weixin/src/main/resources/bootstrap.yml b/intc-modules/intc-weixin/src/main/resources/bootstrap.yml similarity index 88% rename from ruoyi-modules/intc-weixin/src/main/resources/bootstrap.yml rename to intc-modules/intc-weixin/src/main/resources/bootstrap.yml index 5ba5d7d..a4874b0 100644 --- a/ruoyi-modules/intc-weixin/src/main/resources/bootstrap.yml +++ b/intc-modules/intc-weixin/src/main/resources/bootstrap.yml @@ -21,13 +21,13 @@ spring: cloud: nacos: discovery: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 服务注册地址 server-addr: 101.126.95.100:8858 group: intc ip: 101.126.95.100 config: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 配置中心地址 server-addr: 101.126.95.100:8858 # 配置文件格式 diff --git a/ruoyi-modules/intc-invest/src/main/resources/logback.xml b/intc-modules/intc-weixin/src/main/resources/logback.xml similarity index 98% rename from ruoyi-modules/intc-invest/src/main/resources/logback.xml rename to intc-modules/intc-weixin/src/main/resources/logback.xml index 0dc6014..2a2cca0 100644 --- a/ruoyi-modules/intc-invest/src/main/resources/logback.xml +++ b/intc-modules/intc-weixin/src/main/resources/logback.xml @@ -58,7 +58,7 @@ - + diff --git a/ruoyi-modules/intc-weixin/src/main/resources/mapper/weixin/WxAutoReplyMapper.xml b/intc-modules/intc-weixin/src/main/resources/mapper/weixin/WxAutoReplyMapper.xml similarity index 89% rename from ruoyi-modules/intc-weixin/src/main/resources/mapper/weixin/WxAutoReplyMapper.xml rename to intc-modules/intc-weixin/src/main/resources/mapper/weixin/WxAutoReplyMapper.xml index ee91d59..7acc233 100644 --- a/ruoyi-modules/intc-weixin/src/main/resources/mapper/weixin/WxAutoReplyMapper.xml +++ b/intc-modules/intc-weixin/src/main/resources/mapper/weixin/WxAutoReplyMapper.xml @@ -5,9 +5,9 @@ --> - + - + diff --git a/ruoyi-modules/intc-weixin/src/main/resources/mapper/weixin/WxMenuMapper.xml b/intc-modules/intc-weixin/src/main/resources/mapper/weixin/WxMenuMapper.xml similarity index 90% rename from ruoyi-modules/intc-weixin/src/main/resources/mapper/weixin/WxMenuMapper.xml rename to intc-modules/intc-weixin/src/main/resources/mapper/weixin/WxMenuMapper.xml index 5ba029e..5e7b54c 100644 --- a/ruoyi-modules/intc-weixin/src/main/resources/mapper/weixin/WxMenuMapper.xml +++ b/intc-modules/intc-weixin/src/main/resources/mapper/weixin/WxMenuMapper.xml @@ -5,9 +5,9 @@ --> - + - + diff --git a/ruoyi-modules/intc-weixin/src/main/resources/mapper/weixin/WxMsgMapper.xml b/intc-modules/intc-weixin/src/main/resources/mapper/weixin/WxMsgMapper.xml similarity index 92% rename from ruoyi-modules/intc-weixin/src/main/resources/mapper/weixin/WxMsgMapper.xml rename to intc-modules/intc-weixin/src/main/resources/mapper/weixin/WxMsgMapper.xml index a340e12..ab2f7a8 100644 --- a/ruoyi-modules/intc-weixin/src/main/resources/mapper/weixin/WxMsgMapper.xml +++ b/intc-modules/intc-weixin/src/main/resources/mapper/weixin/WxMsgMapper.xml @@ -5,8 +5,8 @@ --> - - + + @@ -37,7 +37,7 @@ - + diff --git a/ruoyi-modules/intc-weixin/src/main/resources/mapper/weixin/WxUserMapper.xml b/intc-modules/intc-weixin/src/main/resources/mapper/weixin/WxUserMapper.xml similarity index 92% rename from ruoyi-modules/intc-weixin/src/main/resources/mapper/weixin/WxUserMapper.xml rename to intc-modules/intc-weixin/src/main/resources/mapper/weixin/WxUserMapper.xml index 11c95b6..2d81eb5 100644 --- a/ruoyi-modules/intc-weixin/src/main/resources/mapper/weixin/WxUserMapper.xml +++ b/intc-modules/intc-weixin/src/main/resources/mapper/weixin/WxUserMapper.xml @@ -5,9 +5,9 @@ --> - + - + diff --git a/ruoyi-modules/pom.xml b/intc-modules/pom.xml similarity index 65% rename from ruoyi-modules/pom.xml rename to intc-modules/pom.xml index 14ffc7f..a2af52c 100644 --- a/ruoyi-modules/pom.xml +++ b/intc-modules/pom.xml @@ -2,27 +2,27 @@ - com.ruoyi - ruoyi + com.intc + intc 3.6.3 4.0.0 - ruoyi-system - ruoyi-gen - ruoyi-job - ruoyi-file + intc-system + intc-gen + intc-job + intc-file intc-invest intc-health intc-weixin - ruoyi-modules + intc-modules pom - ruoyi-modules业务模块 + intc-modules业务模块 diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/intc-visual/intc-monitor/pom.xml similarity index 92% rename from ruoyi-visual/ruoyi-monitor/pom.xml rename to intc-visual/intc-monitor/pom.xml index 1ad1cd2..d42f169 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/intc-visual/intc-monitor/pom.xml @@ -2,16 +2,16 @@ 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"> - com.ruoyi - ruoyi-visual + com.intc + intc-visual 3.6.3 4.0.0 - ruoyi-visual-monitor + intc-visual-monitor - ruoyi-visual-monitor监控中心 + intc-visual-monitor监控中心 diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java b/intc-visual/intc-monitor/src/main/java/com/intc/modules/monitor/IntcMonitorApplication.java similarity index 87% rename from ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java rename to intc-visual/intc-monitor/src/main/java/com/intc/modules/monitor/IntcMonitorApplication.java index 4ea0533..30557b4 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/RuoYiMonitorApplication.java +++ b/intc-visual/intc-monitor/src/main/java/com/intc/modules/monitor/IntcMonitorApplication.java @@ -1,4 +1,4 @@ -package com.ruoyi.modules.monitor; +package com.intc.modules.monitor; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -11,11 +11,11 @@ import de.codecentric.boot.admin.server.config.EnableAdminServer; */ @EnableAdminServer @SpringBootApplication -public class RuoYiMonitorApplication +public class IntcMonitorApplication { public static void main(String[] args) { - SpringApplication.run(RuoYiMonitorApplication.class, args); + SpringApplication.run(IntcMonitorApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ 监控中心启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java b/intc-visual/intc-monitor/src/main/java/com/intc/modules/monitor/config/WebSecurityConfigurer.java similarity index 97% rename from ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java rename to intc-visual/intc-monitor/src/main/java/com/intc/modules/monitor/config/WebSecurityConfigurer.java index 033cd1f..bc32541 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java +++ b/intc-visual/intc-monitor/src/main/java/com/intc/modules/monitor/config/WebSecurityConfigurer.java @@ -1,4 +1,4 @@ -package com.ruoyi.modules.monitor.config; +package com.intc.modules.monitor.config; import de.codecentric.boot.admin.server.config.AdminServerProperties; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/banner.txt b/intc-visual/intc-monitor/src/main/resources/banner.txt similarity index 100% rename from ruoyi-visual/ruoyi-monitor/src/main/resources/banner.txt rename to intc-visual/intc-monitor/src/main/resources/banner.txt diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/intc-visual/intc-monitor/src/main/resources/bootstrap.yml similarity index 83% rename from ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml rename to intc-visual/intc-monitor/src/main/resources/bootstrap.yml index fba7439..9a0ee3c 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/intc-visual/intc-monitor/src/main/resources/bootstrap.yml @@ -6,20 +6,20 @@ server: spring: application: # 应用名称 - name: ruoyi-monitor + name: intc-monitor profiles: # 环境配置 active: dev cloud: nacos: discovery: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 服务注册地址 server-addr: 101.126.95.100:8858 group: intc ip: 154.8.147.51 config: - namespace: 6ff354f8-471d-46ef-bd30-b81588a009cd + namespace: intc # 配置中心地址 server-addr: 101.126.95.100:8858 # 配置文件格式 diff --git a/ruoyi-gateway/src/main/resources/logback.xml b/intc-visual/intc-monitor/src/main/resources/logback.xml similarity index 96% rename from ruoyi-gateway/src/main/resources/logback.xml rename to intc-visual/intc-monitor/src/main/resources/logback.xml index 3c6cbb1..609f7ec 100644 --- a/ruoyi-gateway/src/main/resources/logback.xml +++ b/intc-visual/intc-monitor/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/ruoyi-visual/pom.xml b/intc-visual/pom.xml similarity index 69% rename from ruoyi-visual/pom.xml rename to intc-visual/pom.xml index 53d5bb0..a02ba6c 100644 --- a/ruoyi-visual/pom.xml +++ b/intc-visual/pom.xml @@ -2,21 +2,21 @@ - com.ruoyi - ruoyi + com.intc + intc 3.6.3 4.0.0 - ruoyi-monitor + intc-monitor - ruoyi-visual + intc-visual pom - ruoyi-visual图形化管理模块 + intc-visual图形化管理模块 diff --git a/pom.xml b/pom.xml index e53166e..59c5c9b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,16 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.ruoyi - ruoyi + com.intc + intc 3.6.3 - ruoyi - http://www.ruoyi.vip - 若依微服务系统 + intc + http://www.intc.vip + 智聪管理系统 - 3.6.3 + 3.6.3 UTF-8 UTF-8 1.8 @@ -147,37 +147,37 @@ - com.ruoyi - ruoyi-common-core - ${ruoyi.version} + com.intc + intc-common-core + ${intc.version} - com.ruoyi - ruoyi-common-swagger - ${ruoyi.version} + com.intc + intc-common-swagger + ${intc.version} - com.ruoyi - ruoyi-common-security - ${ruoyi.version} + com.intc + intc-common-security + ${intc.version} - com.ruoyi - ruoyi-common-datascope - ${ruoyi.version} + com.intc + intc-common-datascope + ${intc.version} - com.ruoyi - ruoyi-common-datasource - ${ruoyi.version} + com.intc + intc-common-datasource + ${intc.version} org.postgresql @@ -191,41 +191,41 @@ - com.ruoyi - ruoyi-common-seata - ${ruoyi.version} + com.intc + intc-common-seata + ${intc.version} - com.ruoyi - ruoyi-common-log - ${ruoyi.version} + com.intc + intc-common-log + ${intc.version} - com.ruoyi - ruoyi-common-redis - ${ruoyi.version} + com.intc + intc-common-redis + ${intc.version} - com.ruoyi - ruoyi-api-system - ${ruoyi.version} + com.intc + intc-api-system + ${intc.version} - ruoyi-auth - ruoyi-gateway - ruoyi-visual - ruoyi-modules - ruoyi-api - ruoyi-common + intc-auth + intc-gateway + intc-visual + intc-modules + intc-api + intc-common pom diff --git a/ruoyi-api/ruoyi-api-invest/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-invest/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 51c4a99..0000000 --- a/ruoyi-api/ruoyi-api-invest/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -com.ruoyi.api.invest.factory.RemoteInvestFallbackFactory -com.ruoyi.api.invest.factory.RemoteInvestProdFallbackFactory \ No newline at end of file diff --git a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 6d4ee9f..0000000 --- a/ruoyi-api/ruoyi-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,4 +0,0 @@ -com.ruoyi.system.api.factory.RemoteUserFallbackFactory -com.ruoyi.system.api.factory.RemoteLogFallbackFactory -com.ruoyi.system.api.factory.RemoteFileFallbackFactory -com.ruoyi.system.api.factory.RemoteDictFallbackFactory diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml deleted file mode 100644 index c0be2f7..0000000 --- a/ruoyi-common/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - com.ruoyi - ruoyi - 3.6.3 - - 4.0.0 - - - ruoyi-common-log - ruoyi-common-core - ruoyi-common-redis - ruoyi-common-seata - ruoyi-common-swagger - ruoyi-common-security - ruoyi-common-datascope - ruoyi-common-datasource - - - ruoyi-common - pom - - - ruoyi-common通用模块 - - - diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 30c45a0..0000000 --- a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.ruoyi.common.core.utils.SpringUtils diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 8c4b0e4..0000000 --- a/ruoyi-common/ruoyi-common-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.ruoyi.common.datascope.aspect.DataScopeAspect diff --git a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index ee96a67..0000000 --- a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -com.ruoyi.common.log.service.AsyncLogService -com.ruoyi.common.log.aspect.LogAspect diff --git a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 9ff60df..0000000 --- a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,2 +0,0 @@ -com.ruoyi.common.redis.configure.RedisConfig -com.ruoyi.common.redis.service.RedisService diff --git a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 7418bbc..0000000 --- a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,5 +0,0 @@ -com.ruoyi.common.security.config.WebMvcConfig -com.ruoyi.common.security.service.TokenService -com.ruoyi.common.security.aspect.PreAuthorizeAspect -com.ruoyi.common.security.aspect.InnerAuthAspect -com.ruoyi.common.security.handler.GlobalExceptionHandler diff --git a/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 9fd147d..0000000 --- a/ruoyi-common/ruoyi-common-swagger/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,3 +0,0 @@ -com.ruoyi.common.swagger.config.SwaggerAutoConfiguration -com.ruoyi.common.swagger.config.SwaggerWebConfiguration -com.ruoyi.common.swagger.config.SwaggerBeanPostProcessor diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/ActuatorSecurityConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/ActuatorSecurityConfig.java deleted file mode 100644 index 3a7807e..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/config/ActuatorSecurityConfig.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.ruoyi.system.config; - -import com.ruoyi.common.core.utils.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.web.SecurityFilterChain; - -/** - * @ClassName ActuatorSecurityConfig - * @Author YaphetS - * @Date 2023/3/14 9:18 - * @Version 1.0 - * @Description TODO - */ -@Configuration -@EnableWebSecurity -@EnableGlobalMethodSecurity(prePostEnabled = true) -public class ActuatorSecurityConfig { - - @Autowired - Environment env; - - @Bean - public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { - String contextPath = env.getProperty("management.endpoints.web.base-path"); - if(StringUtils.isEmpty(contextPath)) { - contextPath = "/actuator"; - } - http.csrf().disable(); - http.authorizeRequests() - .antMatchers("/**"+contextPath+"/**") - .authenticated() - .anyRequest() - .permitAll() - .and() - .httpBasic(); - return http.build(); - } -} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml deleted file mode 100644 index 5389fc3..0000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml b/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml deleted file mode 100644 index 1ee684b..0000000 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/logback.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/sql/quartz.sql b/sql/quartz.sql deleted file mode 100644 index cee613b..0000000 --- a/sql/quartz.sql +++ /dev/null @@ -1,174 +0,0 @@ -DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS; -DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE; -DROP TABLE IF EXISTS QRTZ_LOCKS; -DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_TRIGGERS; -DROP TABLE IF EXISTS QRTZ_JOB_DETAILS; -DROP TABLE IF EXISTS QRTZ_CALENDARS; - --- ---------------------------- --- 1、存储每一个已配置的 jobDetail 的详细信息 --- ---------------------------- -create table QRTZ_JOB_DETAILS ( - sched_name varchar(120) not null comment '调度名称', - job_name varchar(200) not null comment '任务名称', - job_group varchar(200) not null comment '任务组名', - description varchar(250) null comment '相关介绍', - job_class_name varchar(250) not null comment '执行任务类名称', - is_durable varchar(1) not null comment '是否持久化', - is_nonconcurrent varchar(1) not null comment '是否并发', - is_update_data varchar(1) not null comment '是否更新数据', - requests_recovery varchar(1) not null comment '是否接受恢复执行', - job_data blob null comment '存放持久化job对象', - primary key (sched_name, job_name, job_group) -) engine=innodb comment = '任务详细信息表'; - --- ---------------------------- --- 2、 存储已配置的 Trigger 的信息 --- ---------------------------- -create table QRTZ_TRIGGERS ( - sched_name varchar(120) not null comment '调度名称', - trigger_name varchar(200) not null comment '触发器的名字', - trigger_group varchar(200) not null comment '触发器所属组的名字', - job_name varchar(200) not null comment 'qrtz_job_details表job_name的外键', - job_group varchar(200) not null comment 'qrtz_job_details表job_group的外键', - description varchar(250) null comment '相关介绍', - next_fire_time bigint(13) null comment '上一次触发时间（毫秒）', - prev_fire_time bigint(13) null comment '下一次触发时间（默认为-1表示不触发）', - priority integer null comment '优先级', - trigger_state varchar(16) not null comment '触发器状态', - trigger_type varchar(8) not null comment '触发器的类型', - start_time bigint(13) not null comment '开始时间', - end_time bigint(13) null comment '结束时间', - calendar_name varchar(200) null comment '日程表名称', - misfire_instr smallint(2) null comment '补偿执行的策略', - job_data blob null comment '存放持久化job对象', - primary key (sched_name, trigger_name, trigger_group), - foreign key (sched_name, job_name, job_group) references QRTZ_JOB_DETAILS(sched_name, job_name, job_group) -) engine=innodb comment = '触发器详细信息表'; - --- ---------------------------- --- 3、 存储简单的 Trigger，包括重复次数，间隔，以及已触发的次数 --- ---------------------------- -create table QRTZ_SIMPLE_TRIGGERS ( - sched_name varchar(120) not null comment '调度名称', - trigger_name varchar(200) not null comment 'qrtz_triggers表trigger_name的外键', - trigger_group varchar(200) not null comment 'qrtz_triggers表trigger_group的外键', - repeat_count bigint(7) not null comment '重复的次数统计', - repeat_interval bigint(12) not null comment '重复的间隔时间', - times_triggered bigint(10) not null comment '已经触发的次数', - primary key (sched_name, trigger_name, trigger_group), - foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group) -) engine=innodb comment = '简单触发器的信息表'; - --- ---------------------------- --- 4、 存储 Cron Trigger，包括 Cron 表达式和时区信息 --- ---------------------------- -create table QRTZ_CRON_TRIGGERS ( - sched_name varchar(120) not null comment '调度名称', - trigger_name varchar(200) not null comment 'qrtz_triggers表trigger_name的外键', - trigger_group varchar(200) not null comment 'qrtz_triggers表trigger_group的外键', - cron_expression varchar(200) not null comment 'cron表达式', - time_zone_id varchar(80) comment '时区', - primary key (sched_name, trigger_name, trigger_group), - foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group) -) engine=innodb comment = 'Cron类型的触发器表'; - --- ---------------------------- --- 5、 Trigger 作为 Blob 类型存储(用于 Quartz 用户用 JDBC 创建他们自己定制的 Trigger 类型，JobStore 并不知道如何存储实例的时候) --- ---------------------------- -create table QRTZ_BLOB_TRIGGERS ( - sched_name varchar(120) not null comment '调度名称', - trigger_name varchar(200) not null comment 'qrtz_triggers表trigger_name的外键', - trigger_group varchar(200) not null comment 'qrtz_triggers表trigger_group的外键', - blob_data blob null comment '存放持久化Trigger对象', - primary key (sched_name, trigger_name, trigger_group), - foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group) -) engine=innodb comment = 'Blob类型的触发器表'; - --- ---------------------------- --- 6、 以 Blob 类型存储存放日历信息， quartz可配置一个日历来指定一个时间范围 --- ---------------------------- -create table QRTZ_CALENDARS ( - sched_name varchar(120) not null comment '调度名称', - calendar_name varchar(200) not null comment '日历名称', - calendar blob not null comment '存放持久化calendar对象', - primary key (sched_name, calendar_name) -) engine=innodb comment = '日历信息表'; - --- ---------------------------- --- 7、 存储已暂停的 Trigger 组的信息 --- ---------------------------- -create table QRTZ_PAUSED_TRIGGER_GRPS ( - sched_name varchar(120) not null comment '调度名称', - trigger_group varchar(200) not null comment 'qrtz_triggers表trigger_group的外键', - primary key (sched_name, trigger_group) -) engine=innodb comment = '暂停的触发器表'; - --- ---------------------------- --- 8、 存储与已触发的 Trigger 相关的状态信息，以及相联 Job 的执行信息 --- ---------------------------- -create table QRTZ_FIRED_TRIGGERS ( - sched_name varchar(120) not null comment '调度名称', - entry_id varchar(95) not null comment '调度器实例id', - trigger_name varchar(200) not null comment 'qrtz_triggers表trigger_name的外键', - trigger_group varchar(200) not null comment 'qrtz_triggers表trigger_group的外键', - instance_name varchar(200) not null comment '调度器实例名', - fired_time bigint(13) not null comment '触发的时间', - sched_time bigint(13) not null comment '定时器制定的时间', - priority integer not null comment '优先级', - state varchar(16) not null comment '状态', - job_name varchar(200) null comment '任务名称', - job_group varchar(200) null comment '任务组名', - is_nonconcurrent varchar(1) null comment '是否并发', - requests_recovery varchar(1) null comment '是否接受恢复执行', - primary key (sched_name, entry_id) -) engine=innodb comment = '已触发的触发器表'; - --- ---------------------------- --- 9、 存储少量的有关 Scheduler 的状态信息，假如是用于集群中，可以看到其他的 Scheduler 实例 --- ---------------------------- -create table QRTZ_SCHEDULER_STATE ( - sched_name varchar(120) not null comment '调度名称', - instance_name varchar(200) not null comment '实例名称', - last_checkin_time bigint(13) not null comment '上次检查时间', - checkin_interval bigint(13) not null comment '检查间隔时间', - primary key (sched_name, instance_name) -) engine=innodb comment = '调度器状态表'; - --- ---------------------------- --- 10、 存储程序的悲观锁的信息(假如使用了悲观锁) --- ---------------------------- -create table QRTZ_LOCKS ( - sched_name varchar(120) not null comment '调度名称', - lock_name varchar(40) not null comment '悲观锁名称', - primary key (sched_name, lock_name) -) engine=innodb comment = '存储的悲观锁信息表'; - --- ---------------------------- --- 11、 Quartz集群实现同步机制的行锁表 --- ---------------------------- -create table QRTZ_SIMPROP_TRIGGERS ( - sched_name varchar(120) not null comment '调度名称', - trigger_name varchar(200) not null comment 'qrtz_triggers表trigger_name的外键', - trigger_group varchar(200) not null comment 'qrtz_triggers表trigger_group的外键', - str_prop_1 varchar(512) null comment 'String类型的trigger的第一个参数', - str_prop_2 varchar(512) null comment 'String类型的trigger的第二个参数', - str_prop_3 varchar(512) null comment 'String类型的trigger的第三个参数', - int_prop_1 int null comment 'int类型的trigger的第一个参数', - int_prop_2 int null comment 'int类型的trigger的第二个参数', - long_prop_1 bigint null comment 'long类型的trigger的第一个参数', - long_prop_2 bigint null comment 'long类型的trigger的第二个参数', - dec_prop_1 numeric(13,4) null comment 'decimal类型的trigger的第一个参数', - dec_prop_2 numeric(13,4) null comment 'decimal类型的trigger的第二个参数', - bool_prop_1 varchar(1) null comment 'Boolean类型的trigger的第一个参数', - bool_prop_2 varchar(1) null comment 'Boolean类型的trigger的第二个参数', - primary key (sched_name, trigger_name, trigger_group), - foreign key (sched_name, trigger_name, trigger_group) references QRTZ_TRIGGERS(sched_name, trigger_name, trigger_group) -) engine=innodb comment = '同步机制的行锁表'; - -commit; \ No newline at end of file diff --git a/sql/ry_20230223.sql b/sql/ry_20230223.sql deleted file mode 100644 index 0006989..0000000 --- a/sql/ry_20230223.sql +++ /dev/null @@ -1,695 +0,0 @@ -SET NAMES utf8mb4; - --- ---------------------------- --- 1、部门表 --- ---------------------------- -drop table if exists sys_dept; -create table sys_dept ( - dept_id bigint(20) not null auto_increment comment '部门id', - parent_id bigint(20) default 0 comment '父部门id', - ancestors varchar(50) default '' comment '祖级列表', - dept_name varchar(30) default '' comment '部门名称', - order_num int(4) default 0 comment '显示顺序', - leader varchar(20) default null comment '负责人', - phone varchar(11) default null comment '联系电话', - email varchar(50) default null comment '邮箱', - status char(1) default '0' comment '部门状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - create_by varchar(64) default '' comment '创建者', - create_time datetime comment '创建时间', - update_by varchar(64) default '' comment '更新者', - update_time datetime comment '更新时间', - primary key (dept_id) -) engine=innodb auto_increment=200 comment = '部门表'; - --- ---------------------------- --- 初始化-部门表数据 --- ---------------------------- -insert into sys_dept values(100, 0, '0', '若依科技', 0, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(101, 100, '0,100', '深圳总公司', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(102, 100, '0,100', '长沙分公司', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(103, 101, '0,100,101', '研发部门', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(104, 101, '0,100,101', '市场部门', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(105, 101, '0,100,101', '测试部门', 3, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(106, 101, '0,100,101', '财务部门', 4, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(107, 101, '0,100,101', '运维部门', 5, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(108, 102, '0,100,102', '市场部门', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); -insert into sys_dept values(109, 102, '0,100,102', '财务部门', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', sysdate(), '', null); - - --- ---------------------------- --- 2、用户信息表 --- ---------------------------- -drop table if exists sys_user; -create table sys_user ( - user_id bigint(20) not null auto_increment comment '用户ID', - dept_id bigint(20) default null comment '部门ID', - user_name varchar(30) not null comment '用户账号', - nick_name varchar(30) not null comment '用户昵称', - user_type varchar(2) default '00' comment '用户类型（00系统用户）', - email varchar(50) default '' comment '用户邮箱', - phonenumber varchar(11) default '' comment '手机号码', - sex char(1) default '0' comment '用户性别（0男 1女 2未知）', - avatar varchar(100) default '' comment '头像地址', - password varchar(100) default '' comment '密码', - status char(1) default '0' comment '帐号状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - login_ip varchar(128) default '' comment '最后登录IP', - login_date datetime comment '最后登录时间', - create_by varchar(64) default '' comment '创建者', - create_time datetime comment '创建时间', - update_by varchar(64) default '' comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (user_id) -) engine=innodb auto_increment=100 comment = '用户信息表'; - --- ---------------------------- --- 初始化-用户信息表数据 --- ---------------------------- -insert into sys_user values(1, 103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '管理员'); -insert into sys_user values(2, 105, 'ry', '若依', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 'admin', sysdate(), '', null, '测试员'); - - --- ---------------------------- --- 3、岗位信息表 --- ---------------------------- -drop table if exists sys_post; -create table sys_post -( - post_id bigint(20) not null auto_increment comment '岗位ID', - post_code varchar(64) not null comment '岗位编码', - post_name varchar(50) not null comment '岗位名称', - post_sort int(4) not null comment '显示顺序', - status char(1) not null comment '状态（0正常 1停用）', - create_by varchar(64) default '' comment '创建者', - create_time datetime comment '创建时间', - update_by varchar(64) default '' comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (post_id) -) engine=innodb comment = '岗位信息表'; - --- ---------------------------- --- 初始化-岗位信息表数据 --- ---------------------------- -insert into sys_post values(1, 'ceo', '董事长', 1, '0', 'admin', sysdate(), '', null, ''); -insert into sys_post values(2, 'se', '项目经理', 2, '0', 'admin', sysdate(), '', null, ''); -insert into sys_post values(3, 'hr', '人力资源', 3, '0', 'admin', sysdate(), '', null, ''); -insert into sys_post values(4, 'user', '普通员工', 4, '0', 'admin', sysdate(), '', null, ''); - - --- ---------------------------- --- 4、角色信息表 --- ---------------------------- -drop table if exists sys_role; -create table sys_role ( - role_id bigint(20) not null auto_increment comment '角色ID', - role_name varchar(30) not null comment '角色名称', - role_key varchar(100) not null comment '角色权限字符串', - role_sort int(4) not null comment '显示顺序', - data_scope char(1) default '1' comment '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）', - menu_check_strictly tinyint(1) default 1 comment '菜单树选择项是否关联显示', - dept_check_strictly tinyint(1) default 1 comment '部门树选择项是否关联显示', - status char(1) not null comment '角色状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - create_by varchar(64) default '' comment '创建者', - create_time datetime comment '创建时间', - update_by varchar(64) default '' comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (role_id) -) engine=innodb auto_increment=100 comment = '角色信息表'; - --- ---------------------------- --- 初始化-角色信息表数据 --- ---------------------------- -insert into sys_role values('1', '超级管理员', 'admin', 1, 1, 1, 1, '0', '0', 'admin', sysdate(), '', null, '超级管理员'); -insert into sys_role values('2', '普通角色', 'common', 2, 2, 1, 1, '0', '0', 'admin', sysdate(), '', null, '普通角色'); - - --- ---------------------------- --- 5、菜单权限表 --- ---------------------------- -drop table if exists sys_menu; -create table sys_menu ( - menu_id bigint(20) not null auto_increment comment '菜单ID', - menu_name varchar(50) not null comment '菜单名称', - parent_id bigint(20) default 0 comment '父菜单ID', - order_num int(4) default 0 comment '显示顺序', - path varchar(200) default '' comment '路由地址', - component varchar(255) default null comment '组件路径', - query varchar(255) default null comment '路由参数', - is_frame int(1) default 1 comment '是否为外链（0是 1否）', - is_cache int(1) default 0 comment '是否缓存（0缓存 1不缓存）', - menu_type char(1) default '' comment '菜单类型（M目录 C菜单 F按钮）', - visible char(1) default 0 comment '菜单状态（0显示 1隐藏）', - status char(1) default 0 comment '菜单状态（0正常 1停用）', - perms varchar(100) default null comment '权限标识', - icon varchar(100) default '#' comment '菜单图标', - create_by varchar(64) default '' comment '创建者', - create_time datetime comment '创建时间', - update_by varchar(64) default '' comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default '' comment '备注', - primary key (menu_id) -) engine=innodb auto_increment=2000 comment = '菜单权限表'; - --- ---------------------------- --- 初始化-菜单信息表数据 --- ---------------------------- --- 一级菜单 -insert into sys_menu values('1', '系统管理', '0', '1', 'system', null, '', 1, 0, 'M', '0', '0', '', 'system', 'admin', sysdate(), '', null, '系统管理目录'); -insert into sys_menu values('2', '系统监控', '0', '2', 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 'admin', sysdate(), '', null, '系统监控目录'); -insert into sys_menu values('3', '系统工具', '0', '3', 'tool', null, '', 1, 0, 'M', '0', '0', '', 'tool', 'admin', sysdate(), '', null, '系统工具目录'); -insert into sys_menu values('4', '若依官网', '0', '4', 'http://ruoyi.vip', null, '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, '若依官网地址'); --- 二级菜单 -insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 'admin', sysdate(), '', null, '用户管理菜单'); -insert into sys_menu values('101', '角色管理', '1', '2', 'role', 'system/role/index', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 'admin', sysdate(), '', null, '角色管理菜单'); -insert into sys_menu values('102', '菜单管理', '1', '3', 'menu', 'system/menu/index', '', 1, 0, 'C', '0', '0', 'system:menu:list', 'tree-table', 'admin', sysdate(), '', null, '菜单管理菜单'); -insert into sys_menu values('103', '部门管理', '1', '4', 'dept', 'system/dept/index', '', 1, 0, 'C', '0', '0', 'system:dept:list', 'tree', 'admin', sysdate(), '', null, '部门管理菜单'); -insert into sys_menu values('104', '岗位管理', '1', '5', 'post', 'system/post/index', '', 1, 0, 'C', '0', '0', 'system:post:list', 'post', 'admin', sysdate(), '', null, '岗位管理菜单'); -insert into sys_menu values('105', '字典管理', '1', '6', 'dict', 'system/dict/index', '', 1, 0, 'C', '0', '0', 'system:dict:list', 'dict', 'admin', sysdate(), '', null, '字典管理菜单'); -insert into sys_menu values('106', '参数设置', '1', '7', 'config', 'system/config/index', '', 1, 0, 'C', '0', '0', 'system:config:list', 'edit', 'admin', sysdate(), '', null, '参数设置菜单'); -insert into sys_menu values('107', '通知公告', '1', '8', 'notice', 'system/notice/index', '', 1, 0, 'C', '0', '0', 'system:notice:list', 'message', 'admin', sysdate(), '', null, '通知公告菜单'); -insert into sys_menu values('108', '日志管理', '1', '9', 'log', '', '', 1, 0, 'M', '0', '0', '', 'log', 'admin', sysdate(), '', null, '日志管理菜单'); -insert into sys_menu values('109', '在线用户', '2', '1', 'online', 'monitor/online/index', '', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 'admin', sysdate(), '', null, '在线用户菜单'); -insert into sys_menu values('110', '定时任务', '2', '2', 'job', 'monitor/job/index', '', 1, 0, 'C', '0', '0', 'monitor:job:list', 'job', 'admin', sysdate(), '', null, '定时任务菜单'); -insert into sys_menu values('111', 'Sentinel控制台', '2', '3', 'http://localhost:8718', '', '', 0, 0, 'C', '0', '0', 'monitor:sentinel:list', 'sentinel', 'admin', sysdate(), '', null, '流量控制菜单'); -insert into sys_menu values('112', 'Nacos控制台', '2', '4', 'http://localhost:8848/nacos', '', '', 0, 0, 'C', '0', '0', 'monitor:nacos:list', 'nacos', 'admin', sysdate(), '', null, '服务治理菜单'); -insert into sys_menu values('113', 'Admin控制台', '2', '5', 'http://localhost:9100/login', '', '', 0, 0, 'C', '0', '0', 'monitor:server:list', 'server', 'admin', sysdate(), '', null, '服务监控菜单'); -insert into sys_menu values('114', '表单构建', '3', '1', 'build', 'tool/build/index', '', 1, 0, 'C', '0', '0', 'tool:build:list', 'build', 'admin', sysdate(), '', null, '表单构建菜单'); -insert into sys_menu values('115', '代码生成', '3', '2', 'gen', 'tool/gen/index', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 'admin', sysdate(), '', null, '代码生成菜单'); -insert into sys_menu values('116', '系统接口', '3', '3', 'http://localhost:8080/swagger-ui/index.html', '', '', 0, 0, 'C', '0', '0', 'tool:swagger:list', 'swagger', 'admin', sysdate(), '', null, '系统接口菜单'); --- 三级菜单 -insert into sys_menu values('500', '操作日志', '108', '1', 'operlog', 'system/operlog/index', '', 1, 0, 'C', '0', '0', 'system:operlog:list', 'form', 'admin', sysdate(), '', null, '操作日志菜单'); -insert into sys_menu values('501', '登录日志', '108', '2', 'logininfor', 'system/logininfor/index', '', 1, 0, 'C', '0', '0', 'system:logininfor:list', 'logininfor', 'admin', sysdate(), '', null, '登录日志菜单'); --- 用户管理按钮 -insert into sys_menu values('1000', '用户查询', '100', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:user:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1001', '用户新增', '100', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:user:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1002', '用户修改', '100', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1003', '用户删除', '100', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:user:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1004', '用户导出', '100', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:user:export', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1005', '用户导入', '100', '6', '', '', '', 1, 0, 'F', '0', '0', 'system:user:import', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1006', '重置密码', '100', '7', '', '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd', '#', 'admin', sysdate(), '', null, ''); --- 角色管理按钮 -insert into sys_menu values('1007', '角色查询', '101', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:role:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1008', '角色新增', '101', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:role:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1009', '角色修改', '101', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:role:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1010', '角色删除', '101', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:role:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1011', '角色导出', '101', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:role:export', '#', 'admin', sysdate(), '', null, ''); --- 菜单管理按钮 -insert into sys_menu values('1012', '菜单查询', '102', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1013', '菜单新增', '102', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1014', '菜单修改', '102', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1015', '菜单删除', '102', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove', '#', 'admin', sysdate(), '', null, ''); --- 部门管理按钮 -insert into sys_menu values('1016', '部门查询', '103', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1017', '部门新增', '103', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1018', '部门修改', '103', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1019', '部门删除', '103', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:remove', '#', 'admin', sysdate(), '', null, ''); --- 岗位管理按钮 -insert into sys_menu values('1020', '岗位查询', '104', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:post:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1021', '岗位新增', '104', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:post:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1022', '岗位修改', '104', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:post:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1023', '岗位删除', '104', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:post:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1024', '岗位导出', '104', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:post:export', '#', 'admin', sysdate(), '', null, ''); --- 字典管理按钮 -insert into sys_menu values('1025', '字典查询', '105', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1026', '字典新增', '105', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1027', '字典修改', '105', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1028', '字典删除', '105', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1029', '字典导出', '105', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:export', '#', 'admin', sysdate(), '', null, ''); --- 参数设置按钮 -insert into sys_menu values('1030', '参数查询', '106', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1031', '参数新增', '106', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1032', '参数修改', '106', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1033', '参数删除', '106', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1034', '参数导出', '106', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:export', '#', 'admin', sysdate(), '', null, ''); --- 通知公告按钮 -insert into sys_menu values('1035', '公告查询', '107', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1036', '公告新增', '107', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1037', '公告修改', '107', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1038', '公告删除', '107', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove', '#', 'admin', sysdate(), '', null, ''); --- 操作日志按钮 -insert into sys_menu values('1039', '操作查询', '500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1040', '操作删除', '500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1041', '日志导出', '500', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:export', '#', 'admin', sysdate(), '', null, ''); --- 登录日志按钮 -insert into sys_menu values('1042', '登录查询', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1043', '登录删除', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1044', '日志导出', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:export', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1045', '账户解锁', '501', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:unlock', '#', 'admin', sysdate(), '', null, ''); --- 在线用户按钮 -insert into sys_menu values('1046', '在线查询', '109', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1047', '批量强退', '109', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1048', '单条强退', '109', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 'admin', sysdate(), '', null, ''); --- 定时任务按钮 -insert into sys_menu values('1049', '任务查询', '110', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1050', '任务新增', '110', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:add', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1051', '任务修改', '110', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1052', '任务删除', '110', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1053', '状态修改', '110', '5', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:changeStatus', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1054', '任务导出', '110', '6', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:job:export', '#', 'admin', sysdate(), '', null, ''); --- 代码生成按钮 -insert into sys_menu values('1055', '生成查询', '115', '1', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:query', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1056', '生成修改', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:edit', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1057', '生成删除', '115', '3', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:remove', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1058', '导入代码', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1059', '预览代码', '115', '4', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview', '#', 'admin', sysdate(), '', null, ''); -insert into sys_menu values('1060', '生成代码', '115', '5', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code', '#', 'admin', sysdate(), '', null, ''); - - --- ---------------------------- --- 6、用户和角色关联表 用户N-1角色 --- ---------------------------- -drop table if exists sys_user_role; -create table sys_user_role ( - user_id bigint(20) not null comment '用户ID', - role_id bigint(20) not null comment '角色ID', - primary key(user_id, role_id) -) engine=innodb comment = '用户和角色关联表'; - --- ---------------------------- --- 初始化-用户和角色关联表数据 --- ---------------------------- -insert into sys_user_role values ('1', '1'); -insert into sys_user_role values ('2', '2'); - - --- ---------------------------- --- 7、角色和菜单关联表 角色1-N菜单 --- ---------------------------- -drop table if exists sys_role_menu; -create table sys_role_menu ( - role_id bigint(20) not null comment '角色ID', - menu_id bigint(20) not null comment '菜单ID', - primary key(role_id, menu_id) -) engine=innodb comment = '角色和菜单关联表'; - --- ---------------------------- --- 初始化-角色和菜单关联表数据 --- ---------------------------- -insert into sys_role_menu values ('2', '1'); -insert into sys_role_menu values ('2', '2'); -insert into sys_role_menu values ('2', '3'); -insert into sys_role_menu values ('2', '4'); -insert into sys_role_menu values ('2', '100'); -insert into sys_role_menu values ('2', '101'); -insert into sys_role_menu values ('2', '102'); -insert into sys_role_menu values ('2', '103'); -insert into sys_role_menu values ('2', '104'); -insert into sys_role_menu values ('2', '105'); -insert into sys_role_menu values ('2', '106'); -insert into sys_role_menu values ('2', '107'); -insert into sys_role_menu values ('2', '108'); -insert into sys_role_menu values ('2', '109'); -insert into sys_role_menu values ('2', '110'); -insert into sys_role_menu values ('2', '111'); -insert into sys_role_menu values ('2', '112'); -insert into sys_role_menu values ('2', '113'); -insert into sys_role_menu values ('2', '114'); -insert into sys_role_menu values ('2', '115'); -insert into sys_role_menu values ('2', '116'); -insert into sys_role_menu values ('2', '500'); -insert into sys_role_menu values ('2', '501'); -insert into sys_role_menu values ('2', '1000'); -insert into sys_role_menu values ('2', '1001'); -insert into sys_role_menu values ('2', '1002'); -insert into sys_role_menu values ('2', '1003'); -insert into sys_role_menu values ('2', '1004'); -insert into sys_role_menu values ('2', '1005'); -insert into sys_role_menu values ('2', '1006'); -insert into sys_role_menu values ('2', '1007'); -insert into sys_role_menu values ('2', '1008'); -insert into sys_role_menu values ('2', '1009'); -insert into sys_role_menu values ('2', '1010'); -insert into sys_role_menu values ('2', '1011'); -insert into sys_role_menu values ('2', '1012'); -insert into sys_role_menu values ('2', '1013'); -insert into sys_role_menu values ('2', '1014'); -insert into sys_role_menu values ('2', '1015'); -insert into sys_role_menu values ('2', '1016'); -insert into sys_role_menu values ('2', '1017'); -insert into sys_role_menu values ('2', '1018'); -insert into sys_role_menu values ('2', '1019'); -insert into sys_role_menu values ('2', '1020'); -insert into sys_role_menu values ('2', '1021'); -insert into sys_role_menu values ('2', '1022'); -insert into sys_role_menu values ('2', '1023'); -insert into sys_role_menu values ('2', '1024'); -insert into sys_role_menu values ('2', '1025'); -insert into sys_role_menu values ('2', '1026'); -insert into sys_role_menu values ('2', '1027'); -insert into sys_role_menu values ('2', '1028'); -insert into sys_role_menu values ('2', '1029'); -insert into sys_role_menu values ('2', '1030'); -insert into sys_role_menu values ('2', '1031'); -insert into sys_role_menu values ('2', '1032'); -insert into sys_role_menu values ('2', '1033'); -insert into sys_role_menu values ('2', '1034'); -insert into sys_role_menu values ('2', '1035'); -insert into sys_role_menu values ('2', '1036'); -insert into sys_role_menu values ('2', '1037'); -insert into sys_role_menu values ('2', '1038'); -insert into sys_role_menu values ('2', '1039'); -insert into sys_role_menu values ('2', '1040'); -insert into sys_role_menu values ('2', '1041'); -insert into sys_role_menu values ('2', '1042'); -insert into sys_role_menu values ('2', '1043'); -insert into sys_role_menu values ('2', '1044'); -insert into sys_role_menu values ('2', '1045'); -insert into sys_role_menu values ('2', '1046'); -insert into sys_role_menu values ('2', '1047'); -insert into sys_role_menu values ('2', '1048'); -insert into sys_role_menu values ('2', '1049'); -insert into sys_role_menu values ('2', '1050'); -insert into sys_role_menu values ('2', '1051'); -insert into sys_role_menu values ('2', '1052'); -insert into sys_role_menu values ('2', '1053'); -insert into sys_role_menu values ('2', '1054'); -insert into sys_role_menu values ('2', '1055'); -insert into sys_role_menu values ('2', '1056'); -insert into sys_role_menu values ('2', '1057'); -insert into sys_role_menu values ('2', '1058'); -insert into sys_role_menu values ('2', '1059'); -insert into sys_role_menu values ('2', '1060'); - --- ---------------------------- --- 8、角色和部门关联表 角色1-N部门 --- ---------------------------- -drop table if exists sys_role_dept; -create table sys_role_dept ( - role_id bigint(20) not null comment '角色ID', - dept_id bigint(20) not null comment '部门ID', - primary key(role_id, dept_id) -) engine=innodb comment = '角色和部门关联表'; - --- ---------------------------- --- 初始化-角色和部门关联表数据 --- ---------------------------- -insert into sys_role_dept values ('2', '100'); -insert into sys_role_dept values ('2', '101'); -insert into sys_role_dept values ('2', '105'); - - --- ---------------------------- --- 9、用户与岗位关联表 用户1-N岗位 --- ---------------------------- -drop table if exists sys_user_post; -create table sys_user_post -( - user_id bigint(20) not null comment '用户ID', - post_id bigint(20) not null comment '岗位ID', - primary key (user_id, post_id) -) engine=innodb comment = '用户与岗位关联表'; - --- ---------------------------- --- 初始化-用户与岗位关联表数据 --- ---------------------------- -insert into sys_user_post values ('1', '1'); -insert into sys_user_post values ('2', '2'); - - --- ---------------------------- --- 10、操作日志记录 --- ---------------------------- -drop table if exists sys_oper_log; -create table sys_oper_log ( - oper_id bigint(20) not null auto_increment comment '日志主键', - title varchar(50) default '' comment '模块标题', - business_type int(2) default 0 comment '业务类型（0其它 1新增 2修改 3删除）', - method varchar(100) default '' comment '方法名称', - request_method varchar(10) default '' comment '请求方式', - operator_type int(1) default 0 comment '操作类别（0其它 1后台用户 2手机端用户）', - oper_name varchar(50) default '' comment '操作人员', - dept_name varchar(50) default '' comment '部门名称', - oper_url varchar(255) default '' comment '请求URL', - oper_ip varchar(128) default '' comment '主机地址', - oper_location varchar(255) default '' comment '操作地点', - oper_param varchar(2000) default '' comment '请求参数', - json_result varchar(2000) default '' comment '返回参数', - status int(1) default 0 comment '操作状态（0正常 1异常）', - error_msg varchar(2000) default '' comment '错误消息', - oper_time datetime comment '操作时间', - cost_time bigint(20) default 0 comment '消耗时间', - primary key (oper_id), - key idx_sys_oper_log_bt (business_type), - key idx_sys_oper_log_s (status), - key idx_sys_oper_log_ot (oper_time) -) engine=innodb auto_increment=100 comment = '操作日志记录'; - - --- ---------------------------- --- 11、字典类型表 --- ---------------------------- -drop table if exists sys_dict_type; -create table sys_dict_type -( - dict_id bigint(20) not null auto_increment comment '字典主键', - dict_name varchar(100) default '' comment '字典名称', - dict_type varchar(100) default '' comment '字典类型', - status char(1) default '0' comment '状态（0正常 1停用）', - create_by varchar(64) default '' comment '创建者', - create_time datetime comment '创建时间', - update_by varchar(64) default '' comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (dict_id), - unique (dict_type) -) engine=innodb auto_increment=100 comment = '字典类型表'; - -insert into sys_dict_type values(1, '用户性别', 'sys_user_sex', '0', 'admin', sysdate(), '', null, '用户性别列表'); -insert into sys_dict_type values(2, '菜单状态', 'sys_show_hide', '0', 'admin', sysdate(), '', null, '菜单状态列表'); -insert into sys_dict_type values(3, '系统开关', 'sys_normal_disable', '0', 'admin', sysdate(), '', null, '系统开关列表'); -insert into sys_dict_type values(4, '任务状态', 'sys_job_status', '0', 'admin', sysdate(), '', null, '任务状态列表'); -insert into sys_dict_type values(5, '任务分组', 'sys_job_group', '0', 'admin', sysdate(), '', null, '任务分组列表'); -insert into sys_dict_type values(6, '系统是否', 'sys_yes_no', '0', 'admin', sysdate(), '', null, '系统是否列表'); -insert into sys_dict_type values(7, '通知类型', 'sys_notice_type', '0', 'admin', sysdate(), '', null, '通知类型列表'); -insert into sys_dict_type values(8, '通知状态', 'sys_notice_status', '0', 'admin', sysdate(), '', null, '通知状态列表'); -insert into sys_dict_type values(9, '操作类型', 'sys_oper_type', '0', 'admin', sysdate(), '', null, '操作类型列表'); -insert into sys_dict_type values(10, '系统状态', 'sys_common_status', '0', 'admin', sysdate(), '', null, '登录状态列表'); - - --- ---------------------------- --- 12、字典数据表 --- ---------------------------- -drop table if exists sys_dict_data; -create table sys_dict_data -( - dict_code bigint(20) not null auto_increment comment '字典编码', - dict_sort int(4) default 0 comment '字典排序', - dict_label varchar(100) default '' comment '字典标签', - dict_value varchar(100) default '' comment '字典键值', - dict_type varchar(100) default '' comment '字典类型', - css_class varchar(100) default null comment '样式属性（其他样式扩展）', - list_class varchar(100) default null comment '表格回显样式', - is_default char(1) default 'N' comment '是否默认（Y是 N否）', - status char(1) default '0' comment '状态（0正常 1停用）', - create_by varchar(64) default '' comment '创建者', - create_time datetime comment '创建时间', - update_by varchar(64) default '' comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (dict_code) -) engine=innodb auto_increment=100 comment = '字典数据表'; - -insert into sys_dict_data values(1, 1, '男', '0', 'sys_user_sex', '', '', 'Y', '0', 'admin', sysdate(), '', null, '性别男'); -insert into sys_dict_data values(2, 2, '女', '1', 'sys_user_sex', '', '', 'N', '0', 'admin', sysdate(), '', null, '性别女'); -insert into sys_dict_data values(3, 3, '未知', '2', 'sys_user_sex', '', '', 'N', '0', 'admin', sysdate(), '', null, '性别未知'); -insert into sys_dict_data values(4, 1, '显示', '0', 'sys_show_hide', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '显示菜单'); -insert into sys_dict_data values(5, 2, '隐藏', '1', 'sys_show_hide', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '隐藏菜单'); -insert into sys_dict_data values(6, 1, '正常', '0', 'sys_normal_disable', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态'); -insert into sys_dict_data values(7, 2, '停用', '1', 'sys_normal_disable', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '停用状态'); -insert into sys_dict_data values(8, 1, '正常', '0', 'sys_job_status', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态'); -insert into sys_dict_data values(9, 2, '暂停', '1', 'sys_job_status', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '停用状态'); -insert into sys_dict_data values(10, 1, '默认', 'DEFAULT', 'sys_job_group', '', '', 'Y', '0', 'admin', sysdate(), '', null, '默认分组'); -insert into sys_dict_data values(11, 2, '系统', 'SYSTEM', 'sys_job_group', '', '', 'N', '0', 'admin', sysdate(), '', null, '系统分组'); -insert into sys_dict_data values(12, 1, '是', 'Y', 'sys_yes_no', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '系统默认是'); -insert into sys_dict_data values(13, 2, '否', 'N', 'sys_yes_no', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '系统默认否'); -insert into sys_dict_data values(14, 1, '通知', '1', 'sys_notice_type', '', 'warning', 'Y', '0', 'admin', sysdate(), '', null, '通知'); -insert into sys_dict_data values(15, 2, '公告', '2', 'sys_notice_type', '', 'success', 'N', '0', 'admin', sysdate(), '', null, '公告'); -insert into sys_dict_data values(16, 1, '正常', '0', 'sys_notice_status', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '正常状态'); -insert into sys_dict_data values(17, 2, '关闭', '1', 'sys_notice_status', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '关闭状态'); -insert into sys_dict_data values(18, 99, '其他', '0', 'sys_oper_type', '', 'info', 'N', '0', 'admin', sysdate(), '', null, '其他操作'); -insert into sys_dict_data values(19, 1, '新增', '1', 'sys_oper_type', '', 'info', 'N', '0', 'admin', sysdate(), '', null, '新增操作'); -insert into sys_dict_data values(20, 2, '修改', '2', 'sys_oper_type', '', 'info', 'N', '0', 'admin', sysdate(), '', null, '修改操作'); -insert into sys_dict_data values(21, 3, '删除', '3', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '删除操作'); -insert into sys_dict_data values(22, 4, '授权', '4', 'sys_oper_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '授权操作'); -insert into sys_dict_data values(23, 5, '导出', '5', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', sysdate(), '', null, '导出操作'); -insert into sys_dict_data values(24, 6, '导入', '6', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', sysdate(), '', null, '导入操作'); -insert into sys_dict_data values(25, 7, '强退', '7', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '强退操作'); -insert into sys_dict_data values(26, 8, '生成代码', '8', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', sysdate(), '', null, '生成操作'); -insert into sys_dict_data values(27, 9, '清空数据', '9', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '清空操作'); -insert into sys_dict_data values(28, 1, '成功', '0', 'sys_common_status', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '正常状态'); -insert into sys_dict_data values(29, 2, '失败', '1', 'sys_common_status', '', 'danger', 'N', '0', 'admin', sysdate(), '', null, '停用状态'); - - --- ---------------------------- --- 13、参数配置表 --- ---------------------------- -drop table if exists sys_config; -create table sys_config ( - config_id int(5) not null auto_increment comment '参数主键', - config_name varchar(100) default '' comment '参数名称', - config_key varchar(100) default '' comment '参数键名', - config_value varchar(500) default '' comment '参数键值', - config_type char(1) default 'N' comment '系统内置（Y是 N否）', - create_by varchar(64) default '' comment '创建者', - create_time datetime comment '创建时间', - update_by varchar(64) default '' comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (config_id) -) engine=innodb auto_increment=100 comment = '参数配置表'; - -insert into sys_config values(1, '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 'admin', sysdate(), '', null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' ); -insert into sys_config values(2, '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 'admin', sysdate(), '', null, '初始化密码 123456' ); -insert into sys_config values(3, '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 'admin', sysdate(), '', null, '深色主题theme-dark，浅色主题theme-light' ); -insert into sys_config values(4, '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 'admin', sysdate(), '', null, '是否开启注册用户功能（true开启，false关闭）'); -insert into sys_config values(5, '用户登录-黑名单列表', 'sys.login.blackIPList', '', 'Y', 'admin', sysdate(), '', null, '设置登录IP黑名单限制，多个匹配项以;分隔，支持匹配（*通配、网段）'); - - --- ---------------------------- --- 14、系统访问记录 --- ---------------------------- -drop table if exists sys_logininfor; -create table sys_logininfor ( - info_id bigint(20) not null auto_increment comment '访问ID', - user_name varchar(50) default '' comment '用户账号', - ipaddr varchar(128) default '' comment '登录IP地址', - status char(1) default '0' comment '登录状态（0成功 1失败）', - msg varchar(255) default '' comment '提示信息', - access_time datetime comment '访问时间', - primary key (info_id), - key idx_sys_logininfor_s (status), - key idx_sys_logininfor_lt (access_time) -) engine=innodb auto_increment=100 comment = '系统访问记录'; - - --- ---------------------------- --- 15、定时任务调度表 --- ---------------------------- -drop table if exists sys_job; -create table sys_job ( - job_id bigint(20) not null auto_increment comment '任务ID', - job_name varchar(64) default '' comment '任务名称', - job_group varchar(64) default 'DEFAULT' comment '任务组名', - invoke_target varchar(500) not null comment '调用目标字符串', - cron_expression varchar(255) default '' comment 'cron执行表达式', - misfire_policy varchar(20) default '3' comment '计划执行错误策略（1立即执行 2执行一次 3放弃执行）', - concurrent char(1) default '1' comment '是否并发执行（0允许 1禁止）', - status char(1) default '0' comment '状态（0正常 1暂停）', - create_by varchar(64) default '' comment '创建者', - create_time datetime comment '创建时间', - update_by varchar(64) default '' comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default '' comment '备注信息', - primary key (job_id, job_name, job_group) -) engine=innodb auto_increment=100 comment = '定时任务调度表'; - -insert into sys_job values(1, '系统默认（无参）', 'DEFAULT', 'ryTask.ryNoParams', '0/10 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, ''); -insert into sys_job values(2, '系统默认（有参）', 'DEFAULT', 'ryTask.ryParams(\'ry\')', '0/15 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, ''); -insert into sys_job values(3, '系统默认（多参）', 'DEFAULT', 'ryTask.ryMultipleParams(\'ry\', true, 2000L, 316.50D, 100)', '0/20 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, ''); - - --- ---------------------------- --- 16、定时任务调度日志表 --- ---------------------------- -drop table if exists sys_job_log; -create table sys_job_log ( - job_log_id bigint(20) not null auto_increment comment '任务日志ID', - job_name varchar(64) not null comment '任务名称', - job_group varchar(64) not null comment '任务组名', - invoke_target varchar(500) not null comment '调用目标字符串', - job_message varchar(500) comment '日志信息', - status char(1) default '0' comment '执行状态（0正常 1失败）', - exception_info varchar(2000) default '' comment '异常信息', - create_time datetime comment '创建时间', - primary key (job_log_id) -) engine=innodb comment = '定时任务调度日志表'; - - --- ---------------------------- --- 17、通知公告表 --- ---------------------------- -drop table if exists sys_notice; -create table sys_notice ( - notice_id int(4) not null auto_increment comment '公告ID', - notice_title varchar(50) not null comment '公告标题', - notice_type char(1) not null comment '公告类型（1通知 2公告）', - notice_content longblob default null comment '公告内容', - status char(1) default '0' comment '公告状态（0正常 1关闭）', - create_by varchar(64) default '' comment '创建者', - create_time datetime comment '创建时间', - update_by varchar(64) default '' comment '更新者', - update_time datetime comment '更新时间', - remark varchar(255) default null comment '备注', - primary key (notice_id) -) engine=innodb auto_increment=10 comment = '通知公告表'; - --- ---------------------------- --- 初始化-公告信息表数据 --- ---------------------------- -insert into sys_notice values('1', '温馨提醒：2018-07-01 若依新版本发布啦', '2', '新版本内容', '0', 'admin', sysdate(), '', null, '管理员'); -insert into sys_notice values('2', '维护通知：2018-07-01 若依系统凌晨维护', '1', '维护内容', '0', 'admin', sysdate(), '', null, '管理员'); - - --- ---------------------------- --- 18、代码生成业务表 --- ---------------------------- -drop table if exists gen_table; -create table gen_table ( - table_id bigint(20) not null auto_increment comment '编号', - table_name varchar(200) default '' comment '表名称', - table_comment varchar(500) default '' comment '表描述', - sub_table_name varchar(64) default null comment '关联子表的表名', - sub_table_fk_name varchar(64) default null comment '子表关联的外键名', - class_name varchar(100) default '' comment '实体类名称', - tpl_category varchar(200) default 'crud' comment '使用的模板（crud单表操作 tree树表操作）', - package_name varchar(100) comment '生成包路径', - module_name varchar(30) comment '生成模块名', - business_name varchar(30) comment '生成业务名', - function_name varchar(50) comment '生成功能名', - function_author varchar(50) comment '生成功能作者', - gen_type char(1) default '0' comment '生成代码方式（0zip压缩包 1自定义路径）', - gen_path varchar(200) default '/' comment '生成路径（不填默认项目路径）', - options varchar(1000) comment '其它生成选项', - create_by varchar(64) default '' comment '创建者', - create_time datetime comment '创建时间', - update_by varchar(64) default '' comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (table_id) -) engine=innodb auto_increment=1 comment = '代码生成业务表'; - - --- ---------------------------- --- 19、代码生成业务表字段 --- ---------------------------- -drop table if exists gen_table_column; -create table gen_table_column ( - column_id bigint(20) not null auto_increment comment '编号', - table_id varchar(64) comment '归属表编号', - column_name varchar(200) comment '列名称', - column_comment varchar(500) comment '列描述', - column_type varchar(100) comment '列类型', - java_type varchar(500) comment 'JAVA类型', - java_field varchar(200) comment 'JAVA字段名', - is_pk char(1) comment '是否主键（1是）', - is_increment char(1) comment '是否自增（1是）', - is_required char(1) comment '是否必填（1是）', - is_insert char(1) comment '是否为插入字段（1是）', - is_edit char(1) comment '是否编辑字段（1是）', - is_list char(1) comment '是否列表字段（1是）', - is_query char(1) comment '是否查询字段（1是）', - query_type varchar(200) default 'EQ' comment '查询方式（等于、不等于、大于、小于、范围）', - html_type varchar(200) comment '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）', - dict_type varchar(200) default '' comment '字典类型', - sort int comment '排序', - create_by varchar(64) default '' comment '创建者', - create_time datetime comment '创建时间', - update_by varchar(64) default '' comment '更新者', - update_time datetime comment '更新时间', - primary key (column_id) -) engine=innodb auto_increment=1 comment = '代码生成业务表字段'; diff --git a/sql/ry_config_20220929.sql b/sql/ry_config_20220929.sql deleted file mode 100644 index 4a4a2c4..0000000 --- a/sql/ry_config_20220929.sql +++ /dev/null @@ -1,219 +0,0 @@ -DROP DATABASE IF EXISTS `ry-config`; - -CREATE DATABASE `ry-config` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; - -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -USE `ry-config`; - -/******************************************/ -/* 表名称 = config_info */ -/******************************************/ -CREATE TABLE `config_info` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(255) DEFAULT NULL, - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) 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 COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `app_name` varchar(128) DEFAULT NULL, - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `c_desc` varchar(256) DEFAULT NULL, - `c_use` varchar(64) DEFAULT NULL, - `effect` varchar(64) DEFAULT NULL, - `type` varchar(64) DEFAULT NULL, - `c_schema` text, - `encrypted_data_key` text COMMENT '秘钥', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; - -insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_modified, src_user, src_ip, app_name, tenant_id, c_desc, c_use, effect, type, c_schema, encrypted_data_key) values -(1,'application-dev.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\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','aaa73b809cfd4d0058893aa13da57806','2020-05-20 12:00:00','2022-04-24 10:26:34','nacos','0:0:0:0:0:0:0:1','','','通用配置','null','null','yaml',NULL,''), -(2,'ruoyi-gateway-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: localhost\n port: 6379\n password:\n cloud:\n gateway:\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# 安全配置\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','57cec5abd0e0a6b77d853750344a9dc0','2020-05-14 14:17:55','2022-09-29 02:48:32','nacos','0:0:0:0:0:0:0:1','','','网关模块','null','null','yaml','',''), -(3,'ruoyi-auth-dev.yml','DEFAULT_GROUP','spring:\n redis:\n host: localhost\n port: 6379\n password:\n','8bd9dada9a94822feeab40de55efced6','2020-11-20 00:00:00','2022-09-29 02:48:42','nacos','0:0:0:0:0:0:0:1','','','认证中心','null','null','yaml','',''), -(4,'ruoyi-monitor-dev.yml','DEFAULT_GROUP','# spring\nspring:\n security:\n user:\n name: ruoyi\n password: 123456\n boot:\n admin:\n ui:\n title: 若依服务状态监控\n','6f122fd2bfb8d45f858e7d6529a9cd44','2020-11-20 00:00:00','2022-09-29 02:48:54','nacos','0:0:0:0:0:0:0:1','','','监控中心','null','null','yaml','',''), -(5,'ruoyi-system-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\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://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.system\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','48e0ed4a040c402bdc2444213a82c910','2020-11-20 00:00:00','2022-09-29 02:49:09','nacos','0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','',''), -(6,'ruoyi-gen-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password:\n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.gen.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\n# 代码生成\ngen:\n # 作者\n author: ruoyi\n # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\n packageName: com.ruoyi.system\n # 自动去除表前缀，默认是false\n autoRemovePre: false\n # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\n tablePrefix: sys_\n','eb592420b3fceae1402881887b8a6a0d','2020-11-20 00:00:00','2022-09-29 02:49:42','nacos','0:0:0:0:0:0:0:1','','','代码生成','null','null','yaml','',''), -(7,'ruoyi-job-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: 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','edcf0e3fe13fea07b4ec08b1088f30b3','2020-11-20 00:00:00','2022-09-29 02:50:50','nacos','0:0:0:0:0:0:0:1','','','定时任务','null','null','yaml','',''), -(8,'ruoyi-file-dev.yml','DEFAULT_GROUP','# 本地文件上传 \r\nfile:\r\n domain: http://127.0.0.1:9300\r\n path: D:/ruoyi/uploadPath\r\n prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n domain: http://8.129.231.12\r\n soTimeout: 3000\r\n connectTimeout: 2000\r\n trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n url: http://8.129.231.12:9000\r\n accessKey: minioadmin\r\n secretKey: minioadmin\r\n bucketName: test','5382b93f3d8059d6068c0501fdd41195','2020-11-20 00:00:00','2020-12-21 21:01:59',NULL,'0:0:0:0:0:0:0:1','','','文件服务','null','null','yaml',NULL,''), -(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,''); - - -/******************************************/ -/* 表名称 = config_info_aggr */ -/******************************************/ -CREATE TABLE `config_info_aggr` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(255) NOT NULL COMMENT 'group_id', - `datum_id` varchar(255) NOT NULL COMMENT 'datum_id', - `content` longtext NOT NULL COMMENT '内容', - `gmt_modified` datetime NOT NULL COMMENT '修改时间', - `app_name` varchar(128) DEFAULT NULL, - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`,`group_id`,`tenant_id`,`datum_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='增加租户字段'; - - -/******************************************/ -/* 表名称 = config_info_beta */ -/******************************************/ -CREATE TABLE `config_info_beta` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `beta_ips` varchar(1024) DEFAULT NULL COMMENT 'betaIps', - `md5` varchar(32) 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 COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text COMMENT '秘钥', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`,`group_id`,`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_beta'; - -/******************************************/ -/* 表名称 = config_info_tag */ -/******************************************/ -CREATE TABLE `config_info_tag` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', - `tag_id` varchar(128) NOT NULL COMMENT 'tag_id', - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL COMMENT 'content', - `md5` varchar(32) 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 COMMENT 'source user', - `src_ip` varchar(50) DEFAULT NULL COMMENT 'source ip', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`,`group_id`,`tenant_id`,`tag_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info_tag'; - -/******************************************/ -/* 表名称 = config_tags_relation */ -/******************************************/ -CREATE TABLE `config_tags_relation` ( - `id` bigint(20) NOT NULL COMMENT 'id', - `tag_name` varchar(128) NOT NULL COMMENT 'tag_name', - `tag_type` varchar(64) DEFAULT NULL COMMENT 'tag_type', - `data_id` varchar(255) NOT NULL COMMENT 'data_id', - `group_id` varchar(128) NOT NULL COMMENT 'group_id', - `tenant_id` varchar(128) DEFAULT '' COMMENT 'tenant_id', - `nid` bigint(20) NOT NULL AUTO_INCREMENT, - PRIMARY KEY (`nid`), - UNIQUE KEY `uk_configtagrelation_configidtag` (`id`,`tag_name`,`tag_type`), - KEY `idx_tenant_id` (`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_tag_relation'; - -/******************************************/ -/* 表名称 = group_capacity */ -/******************************************/ -CREATE TABLE `group_capacity` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `group_id` varchar(128) 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`), - UNIQUE KEY `uk_group_id` (`group_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='集群、各Group容量信息表'; - -/******************************************/ -/* 表名称 = 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) NOT NULL, - `group_id` varchar(128) NOT NULL, - `app_name` varchar(128) DEFAULT NULL COMMENT 'app_name', - `content` longtext NOT NULL, - `md5` varchar(32) DEFAULT NULL, - `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - `src_user` text, - `src_ip` varchar(50) DEFAULT NULL, - `op_type` char(10) DEFAULT NULL, - `tenant_id` varchar(128) DEFAULT '' COMMENT '租户字段', - `encrypted_data_key` text COMMENT '秘钥', - PRIMARY KEY (`nid`), - KEY `idx_gmt_create` (`gmt_create`), - KEY `idx_gmt_modified` (`gmt_modified`), - KEY `idx_did` (`data_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='多租户改造'; - - -/******************************************/ -/* 数据库全名 = nacos_config */ -/* 表名称 = tenant_capacity */ -/******************************************/ -CREATE TABLE `tenant_capacity` ( - `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `tenant_id` varchar(128) 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`), - UNIQUE KEY `uk_tenant_id` (`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='租户容量信息表'; - - -CREATE TABLE `tenant_info` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', - `kp` varchar(128) NOT NULL COMMENT 'kp', - `tenant_id` varchar(128) default '' COMMENT 'tenant_id', - `tenant_name` varchar(128) default '' COMMENT 'tenant_name', - `tenant_desc` varchar(256) DEFAULT NULL COMMENT 'tenant_desc', - `create_source` varchar(32) DEFAULT NULL COMMENT 'create_source', - `gmt_create` bigint(20) NOT NULL COMMENT '创建时间', - `gmt_modified` bigint(20) NOT NULL COMMENT '修改时间', - PRIMARY KEY (`id`), - UNIQUE KEY `uk_tenant_info_kptenantid` (`kp`,`tenant_id`), - KEY `idx_tenant_id` (`tenant_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='tenant_info'; - -CREATE TABLE `users` ( - `username` varchar(50) NOT NULL PRIMARY KEY, - `password` varchar(500) NOT NULL, - `enabled` boolean NOT NULL -); - -CREATE TABLE `roles` ( - `username` varchar(50) NOT NULL, - `role` varchar(50) NOT NULL, - UNIQUE INDEX `idx_user_role` (`username` ASC, `role` ASC) USING BTREE -); - -CREATE TABLE `permissions` ( - `role` varchar(50) NOT NULL, - `resource` varchar(255) NOT NULL, - `action` varchar(8) NOT NULL, - UNIQUE INDEX `uk_role_permission` (`role`,`resource`,`action`) USING BTREE -); - -INSERT INTO users (username, password, enabled) VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', TRUE); - -INSERT INTO roles (username, role) VALUES ('nacos', 'ROLE_ADMIN'); diff --git a/sql/ry_seata_20210128.sql b/sql/ry_seata_20210128.sql deleted file mode 100644 index 41163c1..0000000 --- a/sql/ry_seata_20210128.sql +++ /dev/null @@ -1,80 +0,0 @@ -DROP DATABASE IF EXISTS `ry-seata`; - -CREATE DATABASE `ry-seata` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; - -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - -USE `ry-seata`; - --- -------------------------------- The script used when storeMode is 'db' -------------------------------- --- the table to store GlobalSession data -CREATE TABLE IF NOT EXISTS `global_table` -( - `xid` VARCHAR(128) NOT NULL, - `transaction_id` BIGINT, - `status` TINYINT NOT NULL, - `application_id` VARCHAR(32), - `transaction_service_group` VARCHAR(32), - `transaction_name` VARCHAR(128), - `timeout` INT, - `begin_time` BIGINT, - `application_data` VARCHAR(2000), - `gmt_create` DATETIME, - `gmt_modified` DATETIME, - PRIMARY KEY (`xid`), - KEY `idx_gmt_modified_status` (`gmt_modified`, `status`), - KEY `idx_transaction_id` (`transaction_id`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4; - --- the table to store BranchSession data -CREATE TABLE IF NOT EXISTS `branch_table` -( - `branch_id` BIGINT NOT NULL, - `xid` VARCHAR(128) NOT NULL, - `transaction_id` BIGINT, - `resource_group_id` VARCHAR(32), - `resource_id` VARCHAR(256), - `branch_type` VARCHAR(8), - `status` TINYINT, - `client_id` VARCHAR(64), - `application_data` VARCHAR(2000), - `gmt_create` DATETIME(6), - `gmt_modified` DATETIME(6), - PRIMARY KEY (`branch_id`), - KEY `idx_xid` (`xid`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4; - --- the table to store lock data -CREATE TABLE IF NOT EXISTS `lock_table` -( - `row_key` VARCHAR(128) NOT NULL, - `xid` VARCHAR(96), - `transaction_id` BIGINT, - `branch_id` BIGINT NOT NULL, - `resource_id` VARCHAR(256), - `table_name` VARCHAR(32), - `pk` VARCHAR(36), - `gmt_create` DATETIME, - `gmt_modified` DATETIME, - PRIMARY KEY (`row_key`), - KEY `idx_branch_id` (`branch_id`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4; - --- for AT mode you must to init this sql for you business database. the seata server not need it. -CREATE TABLE IF NOT EXISTS `undo_log` -( - `branch_id` BIGINT(20) NOT NULL COMMENT 'branch transaction id', - `xid` VARCHAR(100) NOT NULL COMMENT 'global transaction id', - `context` VARCHAR(128) NOT NULL COMMENT 'undo_log context,such as serialization', - `rollback_info` LONGBLOB NOT NULL COMMENT 'rollback info', - `log_status` INT(11) NOT NULL COMMENT '0:normal status,1:defense status', - `log_created` DATETIME(6) NOT NULL COMMENT 'create datetime', - `log_modified` DATETIME(6) NOT NULL COMMENT 'modify datetime', - UNIQUE KEY `ux_undo_log` (`xid`, `branch_id`) -) ENGINE = InnoDB - AUTO_INCREMENT = 1 - DEFAULT CHARSET = utf8mb4 COMMENT ='AT transaction mode undo table'; \ No newline at end of file