mvn

720yun_fd_base/gis_service/pom.xml

@@ -19,11 +19,9 @@
             <artifactId>gis_mapper</artifactId>
         </dependency>
 
-
         <dependency>
             <groupId>com.gis</groupId>
             <artifactId>gis_oss</artifactId>
-            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>

720yun_fd_manage/.gitignore

@@ -1,158 +0,0 @@
-## .gitignore for Grails 1.2 and 1.3
-
-# .gitignore for maven
-target/
-*.releaseBackup
-
-# web application files
-#/web-app/WEB-INF
-
-# IDE support files
-/.classpath
-/.launch
-/.project
-/.settings
-/*.launch
-/*.tmproj
-/ivy*
-/eclipse
-
-# default HSQL database files for production mode
-/prodDb.*
-
-# general HSQL database files
-*Db.properties
-*Db.script
-
-# logs
-/stacktrace.log
-/test/reports
-/logs
-*.log
-*.log.*
-
-# project release file
-/*.war
-
-# plugin release file
-/*.zip
-/*.zip.sha1
-
-# older plugin install locations
-/plugins
-/web-app/plugins
-/web-app/WEB-INF/classes
-
-# "temporary" build files
-target/
-out/
-build/
-
-# other
-*.iws
-
-#.gitignore for java
-*.class
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-## .gitignore for eclipse
-
-*.pydevproject
-.project
-.metadata
-bin/**
-tmp/**
-tmp/**/*
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# PDT-specific
-.buildpath
-
-## .gitignore for intellij
-
-*.iml
-*.ipr
-*.iws
-.idea/
-
-## .gitignore for linux
-.*
-!.gitignore
-!.gitattributes
-!.editorconfig
-!.eslintrc
-!.travis.yml
-*~
-
-## .gitignore for windows
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-## .gitignore for mac os x
-
-.DS_Store
-.AppleDouble
-.LSOverride
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear on external disk
-.Spotlight-V100
-.Trashes
-
-## hack for graddle wrapper
-!wrapper/*.jar
-!**/wrapper/*.jar
-
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-gis_generate

720yun_fd_manage/gis_application/pom.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>720yun_fd_manage</artifactId>
-        <groupId>com.gis</groupId>
-        <version>1.0.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>gis_manage</artifactId>
-    <packaging>jar</packaging>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>com.gis</groupId>
-            <artifactId>gis_domain</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.gis</groupId>
-            <artifactId>gis_service</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.gis</groupId>
-            <artifactId>gis_mapper</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.gis</groupId>
-            <artifactId>gis_oss</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-        <finalName>720yun_fd_manage</finalName>
-    </build>
-
-
-</project>

720yun_fd_manage/pom.xml

@@ -4,18 +4,45 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <!-- museum parent-->
     <groupId>com.gis</groupId>
     <artifactId>720yun_fd_manage</artifactId>
-    <packaging>pom</packaging>
     <version>1.0.0</version>
-    <modules>
-        <module>gis_application</module>
-    </modules>
-
+    <packaging>jar</packaging>
     <parent>
         <groupId>com.gis</groupId>
         <artifactId>720yun_fd</artifactId>
         <version>1.0.0</version>
     </parent>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.gis</groupId>
+            <artifactId>gis_domain</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.gis</groupId>
+            <artifactId>gis_service</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.gis</groupId>
+            <artifactId>gis_mapper</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.gis</groupId>
+            <artifactId>gis_oss</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+        <finalName>720yun_fd_manage</finalName>
+    </build>
+
+
 </project>

720yun_fd_manage/remark-m.md

@@ -1,138 +0,0 @@
-# 四维全景 720 2021-2-18
-
-# 测试krpano 切图命令
-    krpanotools makepano -config=配置文件目录 filepath （krpanotools需要注册成全局，不然需要./krpanotools）
-    krpanotools makepano -config=templates/vtour-multires.config /root/user/cms_pano_fcb_dev_data/1/test.jpg
-    
-    
-# oss 关于上传目录到oss说明
-    参考：https://help.aliyun.com/document_detail/39630.html
-    上传文件夹：SDK不支持直接上传文件夹
-    
-    ossutil需要安装
-    ossutil：上传文件夹：在上传文件时携带-r选项可上传文件夹。详情请参见上传文件。
-    
-    参考：https://help.aliyun.com/document_detail/120057.html?spm=a2c4g.11186623.2.17.35aa366cvcZNUJ#section-2ju-iy1-c1g
-        
-    
-# 四维看看doc
-    url: https://test.4dkankan.com/doc.html#/default/%E7%99%BB%E9%99%86%E7%AE%A1%E7%90%86-%E7%99%BB%E9%99%86%E6%A8%A1%E5%9D%97/loginUsingPOST_5
-    userName: apiadmin
-    password: fdkankancui
-    
-    测试登录：密码是加密后， 志广有加密逻辑
-    {
-    	"phoneNum": "13112311178",
-    	"cameraType": "4",
-    	"password": "8F3CTtaeExMTExMTFBYQ==fbrUWbnFMTl1kTzQr7"
-    }
-    
-    用户测试token：
-    eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxMzExMjMxMTE3OCIsInVzZXJOYW1lIjoiMTMxMTIzMTExNzgiLCJpYXQiOjE2MTM4MDU0NDQsImp0aSI6IjI4MzU0Yzk5LWI0MGItNDIyMy04NDk1LTkwODNhYzE1NGUwNyJ9.jRrXM_7nr1C3CZsOkffQgXV15wDNEkLp02P4O91_ee4
-
-#deploy必备工具
-1. jdk1.8
-2. mysql
-3. redis
-4. ossUtil  注意切换bucket
-5. krpano 切全景图 
-6. convert 切缩略图
-7. rabbit MQ
-8. ffmpeg aws环境用来 截取视频第一帧
-
-#dev    
- ## rabbit MQ
-    rul: http://8.135.106.227:15672/
-      admin
-    admin123 
-    
-  doc: http://127.0.0.1:8001/qjkankan/doc.html  
-  appId:BDA385EC848C1A425F746869011C8D23
-   
-   
-# sit 是用的四维看看测试服务器  
-    web: https://test.4dkankan.com/panorama/material.html
-    13112311178    11111111Aa
-    15015980188 Hao123456
-    doc: https://test.4dkankan.com/qjkankan/doc.html
-    doc: 120.25.146.52:8001/qjkankan/doc.html 
-    rabbitMQ： http://120.25.146.52:15672/ guest  guest
-    四维管理后台：https://v4-uat.4dkankan.com/admin/index.html super-admin 
-    
-    #2022-3-19 使用自动部署
-    
-    
-    
-    
-# pro 用四维看看正式服务器
-    2021-11-29
-    rabbitMQ： http://8.129.209.131:15672/ guest  guest    
-    doc: http://8.129.209.131:8001/doc.html owen owen
-    
-    前端：/var/www/html/panorama
-    
-    pro_deploy:
-    2022-2-14 V1.1.0
-        1. 更新someData.json 默认一级分类
-        2. 更新错误提示
-        
-        
-    2022-11-03 v1.2 - 已部署-2022-11-15
-         1. consumer, tour.xml改用相对地址   
-         2. 需要将dev-1.2弄一个pro-1.2版本
-         3. 数据库tb_fodder加一个tour字段
-         4. 全景图历史数据
-            4.1 全景图历史数据tour.xml需要加入tour.xml
-            4.2 dev环境链接生产数据库，更新历史数据
-            4.3 每个作品创建tour.xml
-         5. 上传素材前， 先校验用户空间
-         6. 注意四维看看接口需要过滤激光点云、obj数据
-         7. 提供四维看看管理后台获取作品数据，请求接口需要appId, 不需要token
-         8. redis token 兼容v4 token问题
-            
-## sitAws 2022-11-21
-    doc: https://testeur.4dkankan.com/qjkankan/doc.html  
-    
-## proAws 2022-11-29
-    doc: https://eur.4dkankan.com/qjkankan/doc.html   
-    edit:https://eur.4dkankan.com/panorama/material.html  
-    
- 
-# 交换状态逻辑
-    1. 用户体系用四维看看的sso
-    
-    流程
-    1. 上传全景图
-    2. 添加一个默认作品
-    3. 编辑默认作品 设置为可用状态
-    4. 添加场景，如果没有分组，设置一个默认分组
-    5. 添加分组
-    
-
-    
-# deploy 注意
- 2022-3-22  修改workId 使用雪花id, 需要更新数据库字段， sit已更新
- 
- 2023-2-8 v1.3
-    . tb_work添加type字段
-    . tb_fodder添加dir_id目录字段
-    . 新增tb_dir、tb_report表
-    . 更新作品数据类型， 需要代码运行更新数据库
-    
- 2023-2-14 pro-v1.3 已部署   
- 
-# 版本需求
-### v1.3 
-   添加文件的疑问：
-   1. 分页问题
-   2. 目录层级最大5层
-   3. 拖动文件到目录
- 
-## doc
-    aws: https://docs.aws.amazon.com/zh_cn/lambda/latest/dg/with-s3-tutorial.html
- 
- 
-# appId: 
-    appId :BDA385EC848C1A425F746869011C8D23, 四维看看
- 
-

720yun_fd_manage/run.sh

@@ -1,60 +0,0 @@
-#!/bin/sh
-APP_NAME=720yun_fd_manage.jar
-APP_PORT=8001
-APP_EVN=$2   #执行环境 sit|pro
-APP_ORDER=$1   #执行方法  start|stop|restart
-# 获取进程号
-APP_PID=`netstat -ntpl | grep $APP_PORT | grep LISTEN | awk '{print $7}' | awk -F "/" '{print $1}'`
-
-
-# 启动命令
-startApp(){
-    if [ ${APP_PID} ];
-    then
-    	echo "程序已经在运行了"
-    else
-    	echo "执行 start 方法"
-    	nohup java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5531 -jar -Xmx3072M -Xms512M ./$APP_NAME --spring.profiles.active=$APP_EVN --server.port=$APP_PORT > logs.log 2>error.log &  # 说明pid为空
-	echo Start Success!
-fi
-}
-
-# 停止命令
-stopApp(){
-    echo "执行 stop 方法"
-    if [ ${APP_PID} ];
-	then
-		echo $APP_NAME "存在，执行 stop 方法"
-			kill -9 ${APP_PID} && echo 'Kill Process!'
-	else
-		echo $APP_NAME 没有运行
-    fi
-}
-
-# 重启命令
-restartApp(){
-    echo " 1 执行 restart 方法"
-	stopApp
-	APP_PID=''  #将进程号置空
-	sleep 2
-	echo "进程号：" ${APP_PID} , 端口号：${APP_PORT}
-	echo " 2 执行 restart 方法"
-	startApp
-}
-
-# 判断执行命令 取第一个参数
-case $APP_ORDER in
-    "start")
-        startApp
-        ;;
-    "stop")
-        stopApp
-        ;;
-	"restart")
-		restartApp
-        ;;
-        *)
-     ;;
-esac
-
-

pom.xml

@@ -20,6 +20,8 @@
 
     <modules>
         <module>720yun_fd_base</module>
+        <module>720yun_fd_manage</module>
+        <module>720yun_fd_consumer</module>
     </modules>
 
     <properties>