提交代码

4dkankan-application/pom.xml

@@ -0,0 +1,169 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>4dkankan-application</artifactId>
+    <version>1.0.0</version>
+    <packaging>war</packaging>
+    <repositories>
+        <repository>
+            <id>nexus-aliyun</id>
+            <url>http://maven.aliyun.com/nexus/content/groups/public</url>
+        </repository>
+    </repositories>
+
+    <name>4dkankan-application</name>
+    <description>程序入口</description>
+
+    <parent>
+        <artifactId>4dkankan_v2_mini</artifactId>
+        <groupId>com.fdkankan</groupId>
+        <version>1.0.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-base</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-common</artifactId>
+        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>com.fdkankan</groupId>-->
+            <!--<artifactId>4dkankan-agent</artifactId>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-web</artifactId>
+        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>com.fdkankan</groupId>-->
+            <!--<artifactId>4dkankan-backend</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fdkankan</groupId>-->
+            <!--<artifactId>4dkankan-bbs</artifactId>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-goods</artifactId>
+        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>com.fdkankan</groupId>-->
+            <!--<artifactId>4dkankan-modeling</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fdkankan</groupId>-->
+            <!--<artifactId>4dkankan-order</artifactId>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+            <!--<groupId>com.fdkankan</groupId>-->
+            <!--<artifactId>4dkankan-pay</artifactId>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-scene</artifactId>
+        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>com.fdkankan</groupId>-->
+            <!--<artifactId>4dkankan-trade</artifactId>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-user</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-zuul</artifactId>
+        </dependency>
+        <!-- spring boot -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!-- mysql -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>tk.mybatis</groupId>
+            <artifactId>mapper-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>4dkankan_v2_mini</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <!-- 指定该Main Class为全局的唯一入口 -->
+                    <mainClass>com.fdkankan.App</mainClass>
+                    <fork>true</fork>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal><!--可以把依赖的包都打包到生成的Jar包中-->
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

4dkankan-application/src/main/java/com/fdkankan/App.java

@@ -0,0 +1,28 @@
+package com.fdkankan;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.bind.annotation.RestController;
+
+@SpringBootApplication
+@EnableCaching
+@EnableScheduling
+@EnableAsync
+@RestController
+public class App extends SpringBootServletInitializer {
+
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(App.class);
+    }
+
+    public static void main(String[] args) {
+        SpringApplication.run(App.class, args);
+    }
+}

4dkankan-application/src/main/resources/application.properties

@@ -0,0 +1,97 @@
+server.port=8066
+server.file.location=D:/4Dkankan/
+
+spring.mvc.async.request-timeout=300000
+spring.favicon.enabled = false
+#log
+logging.path=G:/javaProject/4dkankan_v2-mini/logs/
+logging.config=classpath:logback-spring.xml
+logging.level.com.fdkankan=debug
+#mybatis
+mybatis.mapper-locations=classpath:mapper/*.xml
+mybatis.type-aliases-package=com.fdkankan.*.mapper
+mybatis.configuration.mapUnderscoreToCamelCase=true
+mapper.identity=MYSQL
+mapper.mappers=tk.mybatis.mapper.common.Mapper
+#pager
+pagehelper.helper-dialect=mysql
+pagehelper.params=count=countSql
+pagehelper.reasonable=false
+pagehelper.support-methods-arguments=true
+#DB (new)
+spring.datasource.primary.url=jdbc:mysql://39.108.220.65:3306/4dkankan_v2?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.primary.username=root
+spring.datasource.primary.password=4dkk2019%
+spring.datasource.primary.driverClassName=com.mysql.jdbc.Driver
+#DB (old)
+spring.datasource.secondary.url=jdbc:mysql://39.108.220.65:3306/4dkankan?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.secondary.username=root
+spring.datasource.secondary.password=4dkk2019%
+#����й¶  ����Ӱ������
+spring.datasource.secondary.driverClassName=com.mysql.jdbc.Driver
+#spring.datasource.druid.remove-abandoned=true
+#������ӳ���10����δ�رգ��ͻᱻǿ�л��� ��λ��
+#spring.datasource.druid.remove-abandoned-timeout=600
+#spring.datasource.druid.log-abandoned=true
+
+#spring servlet
+spring.servlet.multipart.max-file-size=500MB
+spring.servlet.multipart.max-request-size=1000MB
+spring.servlet.multipart.enabled=true
+spring.servlet.multipart.location=G:/javaProject/9b918c802c3e40282267a89b5231f9a8_201905101446434643/
+#redis
+spring.redis.database=0
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+# ���ӳ�ʱʱ�� ��λ ms�����룩
+spring.redis.timeout=3000ms
+# ���ӳ��е����������ӣ�Ĭ��ֵҲ��8��
+spring.redis.jedis.pool.max-idle=50
+# ���ӳ��е���С�������ӣ�Ĭ��ֵҲ��0��
+spring.redis.jedis.pool.min-idle=8
+# �����ֵΪ-1�����ʾ�����ƣ����pool�Ѿ�������maxActive��jedisʵ�������ʱpool��״̬Ϊexhausted(�ľ�)��
+spring.redis.jedis.pool.max-active=8
+# �ȴ��������ӵ����ʱ�䣬��λ���룬Ĭ��ֵΪ-1����ʾ������ʱ����������ȴ�ʱ�䣬��ֱ���׳�JedisConnectionException
+spring.redis.jedis.pool.max-wait=-1ms
+# file route
+file.route.hardDisk=G:/javaProject/9b918c802c3e40282267a89b5231f9a8_201905101446434643/
+file.route.imageFolder=IMAGE
+file.route.documentFolder=VIDEO
+file.route.videoFolder=DOCUMENT
+file.route.musicFolder=MUSIC
+file.route.imageType=[".bmp", ".jpg", ".jpeg", ".png", ".tiff", ".gif", ".pcx", ".tga", ".exif", ".fpx", ".svg", ".psd",".cdr", ".pcd", ".dxf", ".ufo", ".eps", ".ai", ".raw", ".wmf"]
+file.route.documentType=[".txt", ".doc", ".docx", ".xls", ".htm", ".html", ".jsp", ".rtf", ".wpd", ".pdf", ".ppt",".js"]
+file.route.videoType=[".mp4", ".avi", ".mov", ".wmv", ".asf", ".navi", ".3gp", ".mkv", ".f4v", ".rmvb", ".webm"]
+file.route.musicType=[".mp3", ".wma", ".wav", ".mod", ".ra", ".cd", ".md", ".asf", ".aac", ".vqf", ".ape", ".mid", ".ogg",".m4a", ".vqf"]
+file.route.IPs=["0:0:0:0:0:0:0:1","192.168.0.100"]
+#swagger
+swagger.basePackage=com.fdkankan.web.controller
+swagger.title=4dkankan2.0
+swagger.description=spring-boot
+swagger.serviceUrl=http://192.168.0.163:8066
+swagger.version=2.0
+#rabbitmq
+spring.rabbitmq.host=127.0.0.1
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=guest
+spring.rabbitmq.password=guest
+
+spring.jmx.enabled=false
+
+spring.mvc.static-path-pattern=/**
+spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/, file:${server.file.location}
+
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.time-zone=GMT+8
+
+server.tomcat.uri-encoding=UTF-8
+spring.http.encoding.charset=UTF-8
+spring.http.encoding.enabled=true
+spring.http.encoding.force=true
+
+main.url=https://www.4dkankan.com/
+scene.url=showPC.html?m=
+scene.pro.url=showProMobile.html?m=
+
+scene.pro.new.url=smobile.html?m=

4dkankan-application/src/main/resources/key/private_pkcs8.pem

@@ -0,0 +1,16 @@
+-----BEGIN PRIVATE KEY-----
+MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAOScGE5AR1jixcGo
+HZMd0kySDk4BQarT1rbYTdXFKXmjn5cXnqGFEfCWnD+bSdLi7fyZdrPso8HjMELo
+vPhBdGmcLwSv74/OT8LnXb1nBZV0uvNe8euFLO3VSUJbOi05z4uTBLsiIJRIpMsU
+j43UpEmgVQvTtmDV23ddhbFMJKUxAgMBAAECgYEAjA6R2YcJ7wvn6jAsBlCz4ZNt
+zh5488aa+iRk8z26njo/cNrYpc4X4pTzHwjtXpUHBsWicrLc1NFyZNufwlyfi1eK
+AaoNC2dHghapmahzCdKRbozVA0+1zsGsUPCNXwPM58YHUtax+nSem1gQJME5+XAA
+A3B1HZSswmiYd6KkBm0CQQD+L1TpsIBpGFWAwvznfHymvifYRzSZzY+Jw110vpt2
+rgPCi77emlBqUsZ5q0VLYaqwuNUjcQp4DB2Ur+7+E7+7AkEA5j4CkmYsb4iIgPiQ
+urmpHrYmIfl8/U6pEaENPDyqzkhyD2IfRh1AqFQfTZzCYlzG7QzzNYY2VCeWMbam
+PMbSAwJBAIW7AUGxyt2AH/wOmmBv7mULxorTa6k/rTUdxB2X6tMV2oSQYWtcZNKL
+mkCJC3wNdnBjzj9HSeq+9RE1PtgOK+ECQQDO4v+an1bkbbIC+dfLAZN29kOzmaR3
+VRxUq/vhmb39mFlte0UQ0q5L0zNBoU+F5UoWreFIwi3FVsD+MNqVmC4TAkEArOZg
+qpGu5SgVNcZKQy0KdBQZoYafD9px+UY0KOo9n08l89DiW63YjrZfcOAf68CBV43R
+t+NFRAUK59TFqvNF6w==
+-----END PRIVATE KEY-----

4dkankan-application/src/main/resources/key/public.pem

@@ -0,0 +1,6 @@
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDknBhOQEdY4sXBqB2THdJMkg5O
+AUGq09a22E3VxSl5o5+XF56hhRHwlpw/m0nS4u38mXaz7KPB4zBC6Lz4QXRpnC8E
+r++Pzk/C5129ZwWVdLrzXvHrhSzt1UlCWzotOc+LkwS7IiCUSKTLFI+N1KRJoFUL
+07Zg1dt3XYWxTCSlMQIDAQAB
+-----END PUBLIC KEY-----

4dkankan-application/src/main/resources/logback-spring.xml

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <property name="LOG_MAX_HISTORY" value="180"/>
+    <springProperty scope="context" name="LOG_PATH" source="logging.path"/>
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
+            <pattern>${LOG_PATH}/%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
+        </encoder>
+    </appender>
+    <!-- 按照每天生成日志文件：主项目日志 -->
+    <appender name="file.all" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 追加日志到原文件结尾 -->
+        <Prudent>true</Prudent>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名 -->
+            <FileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- 除按日志记录之外，还配置了日志文件不能超过10M(默认)，若超过10M，日志文件会以索引0开始， -->
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{500} - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
+        </encoder>
+    </appender>
+
+    <!--info日志统一输出到这里-->
+    <appender name="file.info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <Prudent>true</Prudent>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名 每小时生成日志文件 -->
+            <FileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/info/console-info.%d{yyyy-MM-dd-HH}.%i.log</FileNamePattern>
+            <MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- 除按日志记录之外，还配置了日志文件不能超过10M(默认)，若超过10M，日志文件会以索引0开始， -->
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度 %method 方法名  %L 行数 %msg：日志消息，%n是换行符-->
+            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
+        </encoder>
+        <!-- 此日志文件只记录info级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--错误日志统一输出到这里-->
+    <appender name="file.error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <Prudent>true</Prudent>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/error/console-error.%d{yyyy-MM-dd-HH}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- 除按日志记录之外，还配置了日志文件不能超过10M(默认)，若超过10M，日志文件会以索引0开始， -->
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度 %method 方法名  %L 行数 %msg：日志消息，%n是换行符-->
+            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
+        </encoder>
+        <!-- 此日志文件只记录error级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--warn日志统一输出到这里-->
+    <appender name="file.warn" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <Prudent>true</Prudent>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名 按小时生成日志-->
+            <FileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/warn/console-warn.%d{yyyy-MM-dd-HH}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- 除按日志记录之外，还配置了日志文件不能超过10M(默认)，若超过10M，日志文件会以索引0开始， -->
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度 %method 方法名  %L 行数 %msg：日志消息，%n是换行符-->
+            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
+        </encoder>
+        <!-- 此日志文件只记录warn级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>WARN</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--debug级别日志统一输出到这里-->
+    <appender name="file.debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <Prudent>true</Prudent>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名 按小时生成日志-->
+            <FileNamePattern>${LOG_PATH}/%d{yyyy-MM-dd}/debug/console-debug.%d{yyyy-MM-dd-HH}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>${LOG_MAX_HISTORY}</MaxHistory>
+            <!-- 除按日志记录之外，还配置了日志文件不能超过5M，若超过5M，日志文件会以索引0开始，命名日志文件，例如console-debug.2018-08-24-09.1.log -->
+            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>10MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度 %method 方法名  %L 行数 %msg：日志消息，%n是换行符-->
+            <pattern> %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{56}.%method:%L - %msg%n</pattern>
+            <!--<charset>utf-8</charset>-->
+        </encoder>
+        <!-- 此日志文件只记录debug级别的 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>DEBUG</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY </onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
+    <appender name="file.async" class="ch.qos.logback.classic.AsyncAppender">
+        <discardingThreshold>0</discardingThreshold>
+        <queueSize>256</queueSize>
+        <includeCallerData>true</includeCallerData>
+        <appender-ref ref="file.all" />
+    </appender>
+
+    <!--  日志输出级别 -->
+    <!-- TRACE\DEBUG\INFO\WARN\ERROR\FATAL\OFF -->
+    <root level="INFO">
+        <appender-ref ref="console" />
+        <appender-ref ref="file.async"/>
+        <appender-ref ref="file.error" />
+        <appender-ref ref="file.info" />
+        <appender-ref ref="file.debug" />
+        <appender-ref ref="file.warn" />
+    </root>
+
+</configuration>

4dkankan-application/src/main/resources/static/MP_verify_i9CLaVAyYoDvylKB.txt

@@ -0,0 +1 @@
+i9CLaVAyYoDvylKB

4dkankan-application/src/main/resources/static/apppro.html

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+    <head>
+    <title>1</title>
+    </head>
+    <body >
+        4dage,app部门文件，请勿删除
+    </body>
+</html>

4dkankan-application/src/main/resources/static/web/X0r8PxoEUm.txt

@@ -0,0 +1 @@
+ebea6e2c83ad7d665fd274edc800a00f

4dkankan-application/src/main/resources/static/web/editProMobile.html

@@ -0,0 +1,938 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
+        <meta http-equiv="X-UA-Compatible" content="ie=edge">
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <meta name="browsermode" content="application">
+        <meta name="full-screen" content="yes">
+		<script src="static/lib/jquery-2.1.1.min.js"></script>
+		<script src="static/lib/jquery.ajax.arraybuffer.min.js"></script>
+        <script src="static/lib/bytebuffer.min.js"></script>
+        <script src="static/lib/protobuf.min.js"></script>
+        <script src="static/lib/base64.min.js"></script>
+        <script src="static/lib/Tween.js"></script>
+        <script src="static/lib/events.js"></script>
+		<script src="static/lib/three95.min.js"></script>
+		<script src="static/lib/howler.min.js"></script>  
+        <!--REVISION: "95"-->
+        <!-- <script src="static/lib/postprocessing/EffectComposer.js"></script> -->
+        <script src="static/lib/postprocessing/MaskPass.js"></script>
+        <script src="static/lib/postprocessing/RenderPass.js"></script>
+        <script src="static/lib/postprocessing/ShaderPass.js"></script>
+		<script src="static/lib/DetectBrowser.js"></script>
+		 
+		<title>四维看看编辑器</title>
+
+	<style>
+		.hide {
+			display: none !important
+		}
+	#consoleLog{ 
+      width: 120px;
+      height: 153px;
+      position: absolute;
+      left: 0px;
+      bottom: 160px;
+      z-index: 999999;
+      color: black;
+      opacity: 0.9;
+        font-size: 12px;
+    }		
+	</style>
+
+	 
+	<script>
+	
+		window.edit = true;
+		window.isMobile = isMobilePcForEdit()==1;
+		
+		if(window.location.href.substring(0,5)!="https" && window.location.href.indexOf("&test")==-1){
+			window.location.href = window.location.href.replace('http','https');
+		}
+		
+		if(!isMobile){
+			var a = window.location.href.indexOf(".html"); 
+			var postfix = window.location.href.substring(a+5);  
+			window.location.href = "editProPC.html"+postfix;  
+		}
+		 
+		
+	</script>
+	 
+	
+	<link rel="stylesheet" href="static/css/base.css"><!-- 公用 -->
+	<link rel="stylesheet" href="static/css/mainApp.css"> 
+	<link rel="stylesheet" href="static/css/icon/iconfont.css"> 
+	<link rel="stylesheet" href="static/css/toolBoxApp.css"> 	
+	<link rel="stylesheet" href="static/css/swiper-4.3.5.min.css"> 
+	<link rel="stylesheet" href="static/css/cropper.min.css"> 
+	<link rel="stylesheet" href="static/css/rulerLabel.css"> 
+	<link rel="shortcut icon" href="https://4dkk.4dage.com/FDKKIMG/icon/kankan_icon.ico">
+	<link rel="icon" type="image/png" href="https://4dkk.4dage.com/FDKKIMG/icon/kankan_icon192.png" sizes="192x192">
+	<link rel="apple-touch-icon" sizes="180x180" href="https://4dkk.4dage.com/FDKKIMG/icon/kankan_icon180.png">  
+	 
+	
+</head>
+
+<body class="mobile edit"> 
+	<div id="BGcover" class='hide' style="background:#fff; position:fixed; height:400%;width:100%;top:-150%;"></div>
+	<div id="gui-thumb" style="display: none;"></div> 
+	<div id="webgl">
+		<div id="addSpot" class=""> <!-- 热点编辑 --> 
+			<div id="playerB" class="view"> 
+			</div> 			
+		</div>
+		<div class="webgl-inside">
+			
+			<div id="player" style="display: none;"></div>  
+			<div id="mainDesignSth">
+				<!-- <div class="wallDesignOption" id="mainLabel"></div>  -->
+				<div class="rulerAndLabel">
+					<div class="rulers hide"> </div>
+					<div class="dollLabels hide"> </div>
+					<div class="planLabels hide"> </div> 
+				</div> 
+			</div>						 
+
+			<div id="gui-parent">
+				<div id="mediaUpOut" class="hide">
+					<div id="mediaUp"></div>
+				</div>
+				<div id="videoPlayer" class="hide">
+					<div class="overlay"></div>
+					<div class="close icon_close"></div>
+				</div>
+				<div id='tryPlay'></div>
+				<div class="snapshotFlash"></div>
+				<div class="reciprocal hide">
+					<span></span>
+				</div>
+				<div id="bottChoseList" class='bottSlideUp hide'>
+					<div>
+						<ul></ul><ul><li class="cancel">取消</li></ul>
+					</div>
+				</div> 
+				<div id="tourSnap" class="hide">新增导览</div>
+
+				<!-- 询问框 -->
+				<div class="dialog_box Box hide">
+					<div>
+						<div class="icon"></div>
+						<div class="tips">
+							<div class="title"></div>
+							<div class="content"></div>
+						</div>
+						<div class="buttons">
+							<button type="cancel">取消</button>
+							<button type="submit">确定</button>
+						</div>
+					</div>
+				</div>
+
+
+				<div id="hotspot" class="">
+					<div class="staticSpot hide">
+						<div class="inside"></div>
+						<div class="point"></div>
+						<div class="around">
+							<div class="iconfont icon_top"></div>
+							<div class="iconfont icon_top"></div>
+							<div class="iconfont icon_top"></div>
+							<div class="iconfont icon_top"></div>
+						</div>
+					</div>
+					<div class="rulers hide"> </div>
+					<div class="dollLabels hide"> </div>
+					<div class="planLabels hide"> </div>
+					<div class="doors hide"> </div>
+				</div>
+				<div class="snapshotGui overlayGui hide">
+					<div class="corner leftTop"></div>
+					<div class="corner rightTop"></div>
+					<div class="corner leftBott"></div>
+					<div class="corner rightBott"></div>
+				</div>
+				<div id="memory-info" style="display:none; position:fixed; right:10px; top:10px; background-color:#eeeeee; color:#222222; padding:3px 10px 3px 10px; font-size:100%;">
+					GPU memory used: <span id="memory-gpu"></span>
+				</div>
+				<div id="gui-loading" class="message-outer darkGlass2" style="z-index: 888;">
+					<div class="message-inner">
+						<!-- <div id="circleLoader">
+							<div id="loader-cont" title="{[{ LOADING }]}">
+								<svg id="svg" width="100" height="100" viewport="0 0 100 100" version="1.1" xmlns="https://www.w3.org/2000/svg">
+									<circle id="barBg" r="47" cx="50" cy="50" fill="transparent" stroke-dasharray="565.48" stroke-dashoffset="0"></circle>
+									<circle id="bar" r="47" cx="50" cy="50" transform="rotate(-90 50 50)" fill="transparent" stroke-dasharray="295.30" stroke-dashoffset="295.30" style="stroke-dashoffset : 295.30"></circle>
+								</svg>
+							</div>
+						</div> -->
+						<div class="loadingLogo">
+							<div class="img">
+								<i class="iconfont icon_logo"></i>
+							</div>
+							<h2 class="model-title">四维看看</h2>
+						</div>
+
+						<div id="loadProgress">
+							<div class="progressInside"></div>
+						</div>
+						<!-- <div id="loaderCoBrand" style="display:none">
+							<div class="vert-align">
+								<p>{[{ PRESENTED_BY_CAPS }]}</p>
+								<h2 id="loaderCoBrandName"></h2>
+							</div>
+						</div> -->
+						<div class="bottom-logo">
+							<div class="img">
+							<i class="iconfont icondkkr"></i>
+						  </div>
+						</div>
+						<div class="specialPower" style="display:none">
+							<!-- <span class="powered-by">{[{ POWERED_BY }]}</span>
+							&#xA0;<div class="img"></div> -->
+						</div>
+					</div>
+				</div>
+				<div id="gui" style="display: none;">
+					<div class="pinBottom-container">
+						<div class="pinBottom center hide">
+							<div id="view-controllers">
+								<div id="gui-modes-dollhouse" class="darkGlass">
+									<span class="mode">{[{ DOLLHOUSE }]}</span>
+								</div>
+								<div id="gui-modes-floorplan" class="darkGlass">
+									<span class="mode">{[{ FLOOR_PLAN }]}</span>
+								</div>
+							</div>
+						</div>
+						<div class="pinBottom zoomPanel hide">
+							<div id="gui-zoomin" class="buttonZoom buttonZoomIn buttonZoomEnabled" data-placement="top">
+								<div class="buttonZoomContent">
+									<a>
+										<i rel="tooltip" title="{[{ ZOOM_IN }]}" class="icon icon-plus"></i>
+									</a>
+								</div>
+							</div>
+							<div id="gui-zoomout" class="buttonZoom buttonZoomOut buttonZoomEnabled" data-placement="top">
+								<div class="buttonZoomContent">
+									<a>
+										<i rel="tooltip" title="{[{ ZOOM_OUT }]}" class="icon icon-minus"></i>
+									</a>
+								</div>
+							</div>
+						</div>
+						<div class="pinBottom left hide">
+							<div class="viewContainer">
+								<div id="pullTab" class="ui-icon darkGlass">
+									<a>
+										<i rel="tooltip" title="{[{ OPEN_HIGHLIGHTS }]}" class="icon icon-dpad-up"></i>
+									</a>
+								</div>
+								<div id="previous" class="previous desktop-only ui-icon tour">
+									<a>
+										<i rel="tooltip" title="{[{ PREVIOUS }]}" class="icon icon-dpad-left"></i>
+									</a>
+								</div>
+								<div id="play" class="ui-icon tour">
+									<a>
+										<i rel="tooltip" title="{[{ PLAY }]}" class="icon icon-play"></i>
+									</a>
+								</div>
+								<div id="pause" class="ui-icon tour" style="display: none;">
+									<a>
+										<i rel="tooltip" title="{[{ PAUSE }]}" class="icon icon-pause"></i>
+									</a>
+								</div>
+								<div id="next" class="next desktop-only ui-icon wide tour">
+									<a>
+										<i rel="tooltip" title="{[{ NEXT }]}" class="icon icon-dpad-right"></i>
+									</a>
+								</div>
+								<div id="gui-modes-inside" class="ui-icon hide">
+									<a>
+										<i rel="tooltip" title="{[{ EXPLORE_3D_SPACE }]}" class="icon icon-inside"></i>
+									</a>
+								</div>
+								<div id="gui-modes-outside" class="ui-icon hide">
+									<a>
+										<i rel="tooltip" title="{[{ VIEW_DOLLHOUSE }]}" class="icon icon-dollhouse"></i>
+									</a>
+								</div>
+							</div>
+						</div>
+						<div class="pinBottom right hideTarget">
+							<div class="rightViewContainer">
+								<div class="gui-floor">
+									<div class="gui-floor-title"></div>
+									<span class="gui-floor-number"></span>
+									<i class="icon icon-dpad-up"></i>
+									<div class="container"></div>
+								</div>
+								<!--<div id="vr" class="ui-icon wide hidden">
+									<a>
+										<i rel="tooltip" title="{[{ VIEW_IN_VR }]}" class="icon icon-webvr"></i>
+									</a>
+								</div>
+								<div id="sharing" class="ui-icon wide hidden hide">
+									<a>
+										<i rel="tooltip" title="{[{ SOCIAL_SHARING }]}" class="icon icon-share"></i>
+									</a>
+								</div>-->
+								<div id="gui-fullscreen" class="ui-icon wide hide" data-placement="top">
+									<a>
+										<i rel="tooltip" title="{[{ VIEW_FULLSCREEN }]}" class="icon icon-fullscreen"></i>
+									</a>
+								</div>
+								<div id="gui-fullscreen-exit" class="ui-icon wide hide" data-placement="top" style="display: none;">
+									<a>
+										<i rel="tooltip" title="{[{ EXIT_FULLSCREEN }]}" class="icon icon-fullscreen-exit"></i>
+									</a>
+								</div>
+								<!-- <div class="pull-right terms terms2">
+									<a>{[{ TERMS }]}</a>
+								</div> -->
+							</div>
+						</div>
+					</div>
+					<div id="drawer-container">
+						<div id="drawer" class="fullWidth">
+							<div class="frame-container darkGlass">
+								<div id="scrollFrame" class="frame">
+									<ul id="thumb-container" class="slidee"></ul>
+								</div>
+								<div class="scrollbar" id="scroller">
+									<div class="handle"></div>
+								</div>
+							</div>
+						</div>
+						<div id="playHead">
+							<div id="status">
+								<span class="curIdx">1</span>
+								of <span class="totalSteps"></span>
+							</div>
+							<div id="progressBar"></div>
+						</div>
+					</div>
+					<!-- <div class="footer hide">
+						<div class="standard">
+							<div class="footer-help">
+								<a class="hasHover">{[{ HELP }]}</a>
+							</div>
+							<div>|</div>
+							<div class="footer-terms">
+								<a class="hasHover">{[{ 4DAGE_TERMS }]}</a>
+							</div>
+							<img src="images/glyph.svg"> 
+						</div>
+						<div class="close">
+							<a class="hasHover">{[{ CLOSE }]}</a>
+						</div>
+					</div> -->
+				</div> 
+				<div id="gui-spinner" style="display: none;">
+					<div class="gui-spinner-icon"></div>
+				</div>
+				<div class="gui-error message-outer" style="display: none;">
+					<div class="message-inner">
+						<div class="message-content">
+							<div class="error-problem-text"></div>
+							<div class="error-solution-text"></div>
+							<div class="error-explanation"></div>
+							<div class="error-actions"></div>
+						</div>
+					</div>
+				</div>
+				<!-- <div id="quick-blackout" class="quick hide"></div> -->
+				<div id="quick-logo" class="quick-brand">
+					<!-- <img src="images/powered-by-4dage.svg"> -->
+				</div>
+				<div id="hover-top" class="hover-row"></div>
+				<div id="hover-bottom" class="hover-row"></div>
+				<div id="call-to-action">
+					<div id="pause-overlay">
+						<div id="pause-icon">
+							<a>
+								<i class="icon icon-pause"></i>
+							</a>
+						</div>
+					</div>
+					<div id="interaction-modal">
+						<div id="interaction-modal-inner">
+							<div class="tour-title">
+								<span class="desktop-title">{[{ DESKTOP_SHORT_CTA }]}</span>
+								<span class="mobile-title">{[{ MOBILE_SHORT_CTA }]}</span>
+							</div>
+							<div class="interaction left">
+								<h2 class="top-info"></h2>
+								<img class="big-image">
+								<hr>
+								<img class="keyboard">
+							</div>
+							<div class="interaction middle">
+								<h2 class="top-info"></h2>
+								<img class="big-image">
+								<hr>
+								<img class="keyboard">
+							</div>
+							<div class="interaction right">
+								<h2 class="top-info"></h2>
+								<img class="big-image">
+								<hr>
+								<img class="keyboard">
+							</div>
+						</div>
+					</div>
+				</div>
+				<div id="tag-billboards"></div>
+			</div>
+		</div>
+		<!--[if lte IE 9]>
+		 <div class="gui-error message-outer">
+		 <div class='message-inner'>
+		 <div class='message-content' style='font-family: Helvetica Neue, sans-serif;'>
+		 <div class="error-problem-text">浏览器不支持.</div>
+		 <div class="error-solution-text">请安装最新版本的浏览器.</div>
+		 <div class="error-actions">
+		 </div>
+		 </div>
+		 </div>
+		 </div>
+		<![endif]-->
+	</div>
+
+	<!-- 以上是webgl展示部分，以下是编辑页面部分 -->
+
+
+	<div class="resultBox hide">
+		<!--提示框 -->
+		<div>保存成功!</div>
+	</div>
+
+	<div class="waiting">
+		<div class="spinner">
+			<div class="bounce1"></div>
+			<div class="bounce2"></div>
+			<div class="bounce3"></div>
+		</div>
+		<div class="text">请等待...</div>
+	</div>
+
+	<div id="back" class="hide circle"><i class="iconfont icon_back"></i></div>
+	<div id="app">
+		<div id="map" class="">
+			<canvas class="canvas-minmap" id="miniMap" width="100" height="100"></canvas>
+			<canvas class="canvas-minmap" id="playMap" width="100" height="100"></canvas>
+		</div>
+		<header>
+			<!-- <a class="btn-left circle"></a> -->
+			<div id="j-header-dropdown" href="javascript:;" class="btn-center">
+				<i class="typeLogo iconfont  "></i>
+				<span id="j-header-scenename">四维看看</span>
+				<i id="j-header-arrow"></i>
+				<div class="desc">
+					<i></i>
+					<div>
+						<h4 id="j-header-scenetitle"></h4>
+						<div id="j-header-scenedesc"></div>
+					</div>
+				</div>
+			</div>
+			<a class="btn-right circle save"><i class="iconfont icon_save"></i></a>
+		</header>
+		<nav>
+			<ul>
+				<li>
+					<span data-type="dollhouse" class="_3d"><i class="icon_3d iconfont"></i></span>
+					
+					<label>3D</label>
+				</li>
+				<li>
+					<span data-type="floorplan" class="_2d "><i class="icon_2d iconfont"></i></span>
+					<label>2D</label>
+				</li>
+				<li>
+					<span data-type="panorama" class="_roam"><i class="icon_tour iconfont"></i></span>
+					<label>漫游</label>
+				</li>
+			</ul>
+		</nav>
+		<footer>
+			<div>
+				<!-- 菜单 -->
+				<div class="footer-tmpl tmpl-menu">
+					<div class="layout">
+						<ul>
+							<li data-name="information">
+								<span class="information"><i class="iconfont icon_information"></i></span>
+								<label>场景信息</label>
+							</li>
+							<li data-name="screen">
+								<span class="screen"><i class="iconfont icon_screen"></i></span>
+								<label>初始画面</label>
+							</li>
+
+							<li data-name="hotpoint.step-1">
+								<span class="hotpoint"><i class="iconfont icon_hotpoint"></i></span>
+								<label>添加热点</label>
+							</li>
+							<!-- <li data-name="lock">
+							<span class="lock"><i class="iconfont icon_lock"></span>
+							<label>隐私权限</label>
+						</li> -->
+							<li data-name="music">
+								<span class="music"><i class="iconfont icon_music"></i></span>
+								<label>背景音乐</label>
+							</li>
+							<li data-name="snapTour.step-1">
+								<span class="snapTour"><i class="iconfont icon_auto"></i></span>
+								<label>自动导览</label>
+							</li>
+							<li data-name="sign">
+								<span class="sign"><i class="iconfont icon_sign"></i></span>
+								<label>地面Logo</label>
+							</li>
+							<li data-name="wallDesign" class="hide">
+								<span class="wallDesign"><i class="iconfont icon_edit"></i></span>
+								<label>修整模型</label>
+							</li>
+							<!-- <li data-name="hotVisible">
+								<span class="hotVisible"><i class="iconfont icon_eye"></i></span>
+								<label>热点可视</label>
+							</li>
+							<li data-name="panoVisible">
+								<span class="panoVisible"><i class="iconfont icon_walk"></i></span>
+								<label>漫游可行</label>
+							</li> -->
+
+						</ul>
+					</div>
+				</div>
+				<div class="footer-tmpl tmpl-hotEdit buttons" style="display: none">
+					<div class="layout">
+						<div class="buttons">
+							<button type="delete">删除</button>
+							<button type="change">修改</button>
+						</div>
+					</div>
+				</div>
+		
+		
+		
+				<!-- 编辑模型 -->
+				
+				<div class="footer-tmpl tmpl-wallDesign" data-layout="" style="display: none">
+					<div class="layout" data-type="main"> 
+					 
+					
+						<div id="objProp" class="hide">
+							<div id="objWidth">
+								<div class="title">门宽度</div>
+								<div class="scrollCon">
+									<div class="hasValue"></div> 
+								</div>
+								<button class="rectBtn" attr-type="del">删除</button>	
+							</div>
+							<div id="objHeightOrDepth">
+								<div class="title">门高度</div>
+								<div class="scrollCon">
+									<div class="hasValue"></div> 
+								</div>
+								<button class="rectBtn" attr-type="done">确定</button>	
+							</div>
+						</div> 
+					
+						<div id="lineProp" class='hide'>
+							<ul class="chose" id="architecture">
+								<li attr-type="door">
+									<div><i class="iconfont icon_door"></i></div><span>门</span>
+								</li>
+								<li attr-type="window">
+									<div><i class="iconfont icon_window"></i></div><span>窗户</span>
+								</li>
+								<li attr-type="column">
+									<div><i class="iconfont icon_column"></i></div><span>柱子</span>
+								</li>
+								<li attr-type="point">
+									<div><i class="iconfont icon_point"></i></div><span>点</span>
+								</li>
+							</ul>
+							<button class="rectBtn">确定</button>
+						</div> 
+						<div id="houseHeight"> 
+							<div>
+								<div class="title"> 地面高度 </div> 
+								<div class="scrollCon">
+									<div id="floorHeight" class="hasValue"></div>
+								</div> 
+							</div> 
+							<div> 
+								<div class="title"> 屋顶高度 </div> 
+								<div class="scrollCon">
+									<div id="ceilHeight" class="hasValue"></div>
+								</div>  
+							</div> 
+						</div>
+						<div id="roomList" class='hide'>
+							<div class="swiper-container room-preview-rooms"> 
+								<div class="swiper-wrapper">
+								</div>
+								<div class="swiper-scrollbar room-preview-rooms-scrollbar"></div>
+							</div>  
+						</div>	
+						<div class="buttons" data-name="wallDesign">
+							<button type="button">返回主界面</button>
+							<button type="submit" class="unable">保存</button>
+						</div>
+					</div>
+					
+					<div class="layout hide" id="roomProp">  
+						<div>
+							<div>
+								<div class="title">房间名字</div>
+								<div class='name'>
+									<input id="roomName" spellcheck="false" class="right" type="text" minlength="1" maxlength="15" placeholder="限15字" >
+								</div>
+								<div class="tip">限定15字以内</div>
+							</div>
+							<div>
+								<div class="title">显示名称</div>
+								<div class="switch" data-name="nameDisplay"><div></div></div> 
+								<div class="title">显示面积</div>
+								<div class="switch" data-name="areaDisplay"><div></div></div>
+							</div>
+						</div> 
+						<div> 
+							<div id="localBottom">
+								<div class="title"> 房间地面 </div> 
+								<div class="scrollCon">
+									<div id="roomFloorHeight" class="hasValue"></div>
+								</div> 
+							</div> 
+							<div id="localTop"> 
+								<div class="title"> 房间屋顶 </div> 
+								<div class="scrollCon">
+									<div id="roomCeilHeight" class="hasValue"></div>
+								</div>  
+							</div> 
+						</div>
+						 
+						<div class="buttons"> 
+							<button type="submit">确定</button>
+						</div>
+						
+					</div>  
+					
+				</div> 
+		
+		
+		
+		
+		
+		
+				<!-- 热点 -->
+				<div class="footer-tmpl tmpl-hotpoint step-1" style="display: none">
+					<div class="layout">
+						<div class="tips center">选择热点，将上方热点对准所需标记的位置</div>
+						<div class="icons swiper-container">
+							<div class="swiper-wrapper"> </div>
+						</div>
+						<div class="buttons" data-name="hotpoint.step-1">
+							<button type="button">取消</button>
+							<button type="submit">确定</button>
+						</div>
+					</div>
+				</div>
+				<!-- 热点步奏2 -->
+				<div class="footer-tmpl tmpl-hotpoint step-2" data-layout="" style="display: none">
+					<div class="layout">
+						<div class="tips center">拖动滑块、根据绿色阴影调整热点位置</div>
+						<div class="slideCtrl"> </div>
+						<div class="buttons" data-name="hotpoint.step-2" data-next="">
+							<button type="preStep">上一步</button>
+							<button type="submit">确定</button>
+						</div>
+					</div>
+				</div>
+				<!-- 热点步奏3 -->
+				<div class="footer-tmpl tmpl-hotpoint step-3" style="display: none">
+					<div class="layout">
+						<div class="tips">标题</div>
+						<div class="word">
+							<input class="title" type="text" placeholder="请输入您的标题" maxlength="15">
+							<div class="warn hide">请添加标题（15字以内）</div>
+						</div>
+						<!-- <textarea class="desc" placeholder="请输入您的简介" maxlength="200"></textarea> -->
+						<div class="tips">内容简介</div>
+						<div class="textArea desc" contenteditable="true" placeholder="请输入您的简介" maxlength="200"></div>
+
+						<div class="tips">添加链接</div>
+						<div class="link">
+							<input class="text" type="text" placeholder="添加链接文本" maxlength="40">
+							<input class="url" type="text" placeholder="添加链接地址" maxlength="500">
+							<a class="submit">添加</a>
+							<a class="button">取消</a>
+						</div>
+
+						<div class="tips">添加图片</div>
+						<div class="photo">
+							<input id="spot_photo" class="mediaInput" type="file" style="display:none" accept="image/*">
+							<div for="spot_photo" class="preview">
+								添加图片
+							</div>
+							<!-- <a class="del hide"></a> -->
+						</div>
+
+						<div class="tips">添加音频</div>
+						<div class="audio">
+							<div class="textArea">无</div>
+							<a class="submit">上传音频</a>
+						</div>
+
+						<div class="tips">添加视频</div>
+						<div class="video">
+							<input id="spot_video" class="mediaInput" type="file" style="display:none" accept="video/*">
+							<div for="spot_video" class="preview">
+								<!-- <div class="playBtn"><span></span></div>  -->
+								<span class='text'>添加视频</span>
+							</div>
+							<!-- <a class="del hide"></a> -->
+						</div>
+						<div class="buttons whiteBG" data-name="hotpoint.step-3">
+							<span class="tips hide" style="padding-top: 0; display:block; line-height: 0.8rem;">旧版热点仅能修改展示信息，无法修改位置</span>
+							<button type="button" class="hide">取消</button>
+							<button type="preStep">上一步</button>
+							<button type="submit">保存</button>
+						</div>
+					</div>
+				</div>
+				<!-- 初始画面 -->
+				<div class="footer-tmpl tmpl-screen" style="display: none">
+					<div class="layout">
+						<div class="tips center">移动屏幕,点击确定选择您的初始画面</div>
+						<div class="buttons" data-name="screen">
+							<button type="button">取消</button>
+							<button type="submit">确定</button>
+						</div>
+					</div>
+				</div>
+			 
+				<!-- 场景信息 -->
+				<div class="footer-tmpl tmpl-information" style="display: none">
+					<div class="layout">
+						<div class="tips">填写您项目的场景信息</div> 
+						<div class="word">
+							<input class="title" type="text" placeholder="请输入您的标题" maxlength="15" spellcheck="false">
+							<div class="warn hide">请添加标题（15字以内）</div>
+						</div>  
+						<!-- <textarea class="desc" placeholder="请输入简介" maxlength="200"></textarea> -->
+						<div contenteditable="true" placeholder="请输入简介" class="desc" maxlength="200"></div>
+						<div class="link">
+							<input class="text" type="text" placeholder="添加链接文本" maxlength="40">
+							<input class="url" type="text" placeholder="添加链接地址" maxlength="500">
+							<a class="submit">添加</a>
+							<a class="button">取消</a>
+						</div>
+						<!-- <div class="limit">(&nbsp;
+						<label>0</label>/200&nbsp;)</div> -->
+						<div class="tips">请选择分类</div>
+						<div class="categorys">
+						</div>
+						<div class="lock">
+							<div>
+								<div class="tips">隐私权限</div>
+								<div class="switch">
+									<div></div>
+								</div>
+							</div>
+							<div class="word" style='opacity:0; pointer-events:none'>
+								<input type="text" maxlength="4" placeholder="4位数字或字母">
+								<!--4位字母或数字 -->
+								<div class="warn hide">请输入4位数的密码</div>
+							</div>
+						</div>
+						<div class="buttons" data-name="information">
+							<button type="button">取消</button>
+							<button type="submit">确定</button>
+						</div>
+					</div>
+				</div>
+				 
+				
+				
+				
+				<!-- 选择音乐 -->
+				<div class="footer-tmpl tmpl-music" style="display: none">
+					<div class="layout">
+						<div class="tips">选择音乐
+							<span class="right">无音乐</span>
+						</div>
+						<ul class="chose"></ul>
+						<div class="buttons" data-name="music">
+							<button type="button">取消</button>
+							<button type="submit">确定</button>
+						</div>
+					</div>
+				</div>
+				<!-- 地面标志 -->
+				<div class="footer-tmpl tmpl-sign" style="display: none">
+					<img class="icon">
+					<div class="layout">
+						<div class="tips">
+							标志样式
+							<span class="right">修改</span>
+						</div>
+						<ul class="chose">
+							<li><span></span></li>
+							<li><span></span></li>
+							<li><span></span></li>
+							<li><span></span></li>
+						</ul>
+						<div class="clear"></div>
+						<div class="size">
+							<span>标志大小</span>
+							<div id="floorLogoSize"> </div>
+						</div>
+						<div class="buttons" data-name="sign">
+							<button type="button" @click="close">取消</button>
+							<button type="submit" @click="save">确定</button>
+						</div>
+					</div>
+				</div>
+				<!-- 热点可视 -->
+				<div class="footer-tmpl tmpl-hotVisible" style="display: none">
+					<div class="layout">
+						<div class="tips center"> 点击选择要设置的热点</div>
+						<div class="buttons" data-name="hotVisible">
+							<button type="button">取消</button>
+							<button type="submit">确定</button>
+						</div>
+					</div>
+				</div>
+
+				<div class="footer-tmpl tmpl-panoVisible" style="display: none">
+					<div class="layout">
+						<div class="tips center">点击漫游点可以设置和中心漫游点是否通行</div>
+						<div class="buttons" data-name="panoVisible">
+							<button type="button">取消</button>
+							<button type="submit">确定</button>
+						</div>
+					</div>
+				</div>
+
+
+
+				<!-- 录制 -->
+				<div class="footer-tmpl tmpl-snapTour step-1" style="display: none">
+					<div class="layout">
+						<div class="tips center">点击确定开始录制导览</div>
+						<div class="buttons" data-name="snapTour.step-1">
+							<button type="button">取消</button>
+							<button type="submit">确定</button>
+						</div>
+					</div>
+				</div>
+
+				<div class="footer-tmpl tmpl-snapTour step-2" style="display: none">
+					<div class="layout">
+						<div class="tips center"><i></i><span class="times">00:00</span></div>
+						<div class="buttons" data-name="snapTour.step-2">
+							<button type="button">取消</button>
+							<button type="submit">完成录制</button>
+						</div>
+					</div>
+				</div>
+
+				<!-- 删除 -->
+				<div class="footer-tmpl tmpl-delete" style="display: none">
+					<div class="layout">
+						<div class="tips center"></div>
+						<small class="tips center">（该场景数据将被删除，不可恢复。）</small>
+						<div class="buttons" data-name="delete">
+							<button type="button">取消</button>
+							<button type="submit">确定</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</footer>
+		<!-- 隐私权限 -->
+		<div class="footer-tmpl tmpl-lock Box" style="display: none">
+			<div>
+				<div class="icon"></div>
+				<div class="psd">
+					<input type="text" maxlength="4">
+					<ul>
+						<!-- <li><input type="text" maxlength="1" ></li>
+						<li><input type="text" maxlength="1"></li>
+						<li><input type="text" maxlength="1"></li>
+						<li><input type="text" maxlength="1"></li> -->
+						<li></li>
+						<li></li>
+						<li></li>
+						<li></li>
+					</ul>
+				</div>
+				<div class="tips">请设置您的加密密码</div>
+				<div class="buttons" data-name="lock">
+					<button type="cancelPsd">取消加密</button>
+					<button type="submit">确定</button>
+				</div>
+			</div>
+		</div>
+	</div>
+	 
+	<script src="static/lib/flexible.min.js"></script> 
+	<script src="static/lib/exif.min.js"></script>
+	<script id='recordJS'></script> 
+	<script> 
+		//手机端是微信才使用网页录音
+		if(window.navigator.userAgent.toLowerCase().match(/MicroMessenger/i) == 'micromessenger'){
+			$("#recordJS")[0].src = 'static/lib/record/index.js';
+		}
+		
+		 
+	</script> 
+	 
+	
+	
+	<script src="static/lib/autoLogin.js"></script>  <!-- 防止掉线 --> 
+	
+	<script src="static/js/editApp.js"></script>   
+	
+	
+	 
+
+	<script> 
+			  
+
+		//function start() {
+			var app = new App('0mVvxHHT');
+			console.log('开始测试！');
+			//app.start();
+		//}
+		 
+	 
+	</script>  
+
+
+	
+	<script src="static/lib/swiper-4.3.5.min.js"></script>
+	<script src="static/lib/jroll.2.6.5.min.js"></script>
+	
+    <script src="static/lib/cropper.min.js"></script>
+	 
+	<script src="static/lib/wangEditorV2.min.js"></script>
+	<script src="static/lib/howler.min.js" class="build keep"></script>
+	 
+	<!-- <script src="static/lib/qiniu.js"></script>
+	<script src="static/lib/7niuUpload.js"></script>   -->
+	
+	 
+	
+	
+	
+</body>
+
+</html>

4dkankan-application/src/main/resources/static/web/index.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta http-equiv="Cache-Control" content="max-age=7200" />
+    <meta content="telephone=no" name="format-detection">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="browsermode" content="application">
+    <meta name="full-screen" content="yes">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="世界上首款消费级3D相机—四维看看（4DKanKan）。技术核心三要素：易操作；自动化；高精度。主要应用领域为数字文博、数字地产、数字电商、数字餐饮、数字家居等。">
+    <link rel="shortcut icon" href="//4dkk.4dage.com/FDKKIMG/icon/kankan_icon.ico">
+    <link rel="icon" type="image/png" href="//4dkk.4dage.com/FDKKIMG/icon/kankan_icon192.png" sizes="192x192">
+    <link rel="apple-touch-icon" sizes="180x180" href="//4dkk.4dage.com/FDKKIMG/icon/kankan_icon180.png">
+    <title>四维看看</title>
+</head>
+<body>
+  <script>
+      location.href = '/main.html'
+  </script>
+</body>
+</html>