xiewenjie 4 vuotta sitten
vanhempi
commit
1054082899
100 muutettua tiedostoa jossa 435 lisäystä ja 677 poistoa
  1. 0 1
      .gitignore
  2. 58 13
      pom.xml
  3. 0 66
      src/main/java/com/sxz/base/job/ScheduleJob.java
  4. 0 0
      src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/0ddb6b40-b7f0-4007-a544-29122b46ad3a.zip
  5. 0 18
      src/main/java/com/sxz/base/service/impl/CompanyServiceImpl.java
  6. 0 23
      src/test/java/com/sxz/base/HttpTest.java
  7. 0 530
      src/test/java/com/sxz/base/JunitTest.java
  8. 80 0
      sxz-application/pom.xml
  9. 1 1
      src/main/java/com/sxz/base/ChangeingApplication.java
  10. 2 2
      src/main/resources/application-dev.properties
  11. 1 1
      src/main/resources/application-prod.properties
  12. 1 1
      src/main/resources/application-uat.properties
  13. 0 0
      sxz-application/src/main/resources/application.properties
  14. 1 1
      src/main/resources/logback-spring.xml
  15. 0 0
      sxz-application/src/main/resources/templates/logList.html
  16. 273 0
      sxz-base/pom.xml
  17. 2 2
      src/main/java/com/sxz/base/listener/OkHttpLogInterceptor.java
  18. 3 5
      src/main/java/com/sxz/base/config/MyBatisPlusConfig.java
  19. 1 1
      src/main/java/com/sxz/base/config/PageHelperAutoConfiguration.java
  20. 1 1
      src/main/java/com/sxz/base/constant/CodeConstant.java
  21. 1 1
      src/main/java/com/sxz/base/constant/ConstantFileName.java
  22. 1 1
      src/main/java/com/sxz/base/constant/ConstantFilePath.java
  23. 1 1
      src/main/java/com/sxz/base/constant/PathConfig.java
  24. 1 1
      src/main/java/com/sxz/base/constant/Variable.java
  25. 3 3
      src/main/java/com/sxz/base/controller/BaseController.java
  26. 4 4
      src/main/java/com/sxz/base/jumi/JUMILoader.java
  27. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/23.4dage
  28. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/23.obj
  29. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/23.obj.mtl
  30. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/3d66Model-515617-1-11.jpg
  31. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/first/23.mtl
  32. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/first/23.obj
  33. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat0_a.jpg
  34. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat0_c.jpg
  35. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat0_g.jpg
  36. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat0_n.jpg
  37. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat0_r.jpg
  38. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat10_c.jpg
  39. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat10_g.jpg
  40. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat10_r.jpg
  41. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat11_c.jpg
  42. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat11_g.jpg
  43. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat11_r.jpg
  44. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat12_c.jpg
  45. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat12_g.jpg
  46. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat12_r.jpg
  47. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat13_c.jpg
  48. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat13_g.jpg
  49. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat13_r.jpg
  50. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat14_c.jpg
  51. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat14_g.jpg
  52. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat14_r.jpg
  53. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat15_c.jpg
  54. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat15_g.jpg
  55. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat15_r.jpg
  56. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat16_c.jpg
  57. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat16_g.jpg
  58. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat16_r.jpg
  59. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat17_c.jpg
  60. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat17_g.jpg
  61. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat17_r.jpg
  62. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat18_c.jpg
  63. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat18_g.jpg
  64. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat18_r.jpg
  65. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat19_c.jpg
  66. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat19_g.jpg
  67. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat19_r.jpg
  68. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat1_a.jpg
  69. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat1_c.jpg
  70. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat1_g.jpg
  71. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat1_n.jpg
  72. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat1_r.jpg
  73. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat20_c.jpg
  74. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat20_g.jpg
  75. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat20_r.jpg
  76. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat21_c.jpg
  77. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat21_g.jpg
  78. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat21_r.jpg
  79. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat22_c.jpg
  80. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat22_g.jpg
  81. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat22_r.jpg
  82. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat23_c.jpg
  83. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat23_g.jpg
  84. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat23_r.jpg
  85. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat24_c.jpg
  86. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat24_g.jpg
  87. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat24_r.jpg
  88. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat25_c.jpg
  89. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat25_g.jpg
  90. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat25_r.jpg
  91. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat26_c.jpg
  92. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat26_g.jpg
  93. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat26_r.jpg
  94. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat27_c.jpg
  95. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat27_g.jpg
  96. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat27_r.jpg
  97. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat28_c.jpg
  98. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat28_g.jpg
  99. 0 0
      sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat28_r.jpg
  100. 0 0
      src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat29_c.jpg

+ 0 - 1
.gitignore

@@ -11,7 +11,6 @@
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
-
 # Package Files #
 *.jar
 *.war

+ 58 - 13
pom.xml

@@ -2,35 +2,57 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>com.fdkk</groupId>
+    <artifactId>changeing</artifactId>
+    <version>1.0.0</version>
+    <packaging>pom</packaging>
+    <name>changeing</name>
+    <description>sxz</description>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.4.5</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <relativePath/>
     </parent>
-    <groupId>com.sxz</groupId>
-    <artifactId>changeing</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>changeing</name>
-    <description>sxz</description>
 
+    <modules>
+        <module>sxz-application</module>
+        <module>sxz-base</module>
+        <module>sxz-common</module>
+        <module>sxz-modules</module>
+        <module>sxz-core</module>
+    </modules>
     <properties>
         <java.version>1.8</java.version>
+        <spring-boot.version>2.4.5</spring-boot.version>
+        <swagger.version>2.9.2</swagger.version>
+        <maven-surefire-plugin.version>  2.22.0</maven-surefire-plugin.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+
+
+    <dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
+            <version>${spring-boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
+            <version>${spring-boot.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+            <version>${spring-boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring-boot.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -42,6 +64,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-boot.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
@@ -53,14 +76,27 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>
+            <version>${spring-boot.version}</version>
+        </dependency>
+
+        <!-- swagger -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>${swagger.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>${swagger.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
+            <version>${spring-boot.version}</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
@@ -69,12 +105,14 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
+            <version>1.4.200</version>
             <scope>runtime</scope>
         </dependency>
         <!-- 代码生成器  依赖 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-freemarker</artifactId>
+            <version>${spring-boot.version}</version>
         </dependency>
         <!-- pagehelper 依赖 -->
         <dependency>
@@ -241,6 +279,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
+            <version>${spring-boot.version}</version>
         </dependency>
 
         <!-- lettuce pool 缓存连接池 -->
@@ -264,21 +303,27 @@
         <!--			<version>1.0.1</version>-->
         <!--		</dependency>-->
     </dependencies>
+    </dependencyManagement>
     <build>
         <plugins>
             <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.18.1</version>
+                <version>${maven-surefire-plugin.version}</version>
                 <configuration>
-                    <skipTests>true</skipTests>
+                    <skipTests>true</skipTests>    <!--默认关掉单元测试 -->
                 </configuration>
             </plugin>
-
         </plugins>
     </build>
 

+ 0 - 66
src/main/java/com/sxz/base/job/ScheduleJob.java

@@ -1,66 +0,0 @@
-//package com.sxz.base.job;
-//
-//import com.alibaba.fastjson.JSONArray;
-//import com.alibaba.fastjson.JSONObject;
-//import com.sxz.base.entity.ModelUploadEntity;
-//import com.sxz.base.entity.RenovationPartsDetailEntity;
-//import com.sxz.base.service.IModelUploadService;
-//import com.sxz.base.service.IRenovationPartsDetailService;
-//import com.sxz.base.util.DateUtil;
-//import lombok.extern.log4j.Log4j2;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.scheduling.annotation.Scheduled;
-//import org.springframework.stereotype.Component;
-//import tk.mybatis.mapper.entity.Condition;
-//
-//import java.util.Date;
-//import java.util.HashSet;
-//import java.util.List;
-//import java.util.Set;
-//
-//
-//@Log4j2
-//@Component
-//public class ScheduleJob {
-//
-//    @Autowired
-//    private IRenovationPartsDetailService renovationPartsDetailService;
-//
-//    @Autowired
-//    private IModelUploadService modelUploadService;
-//
-//    @Scheduled(cron = "0 0 2 * * ?")
-//    public void job2() {
-//
-//        try {
-//
-//            Condition condition = new Condition(RenovationPartsDetailEntity.class);
-//            condition.and().andEqualTo("examine", 1).andGreaterThanOrEqualTo("examineTime",
-//                            DateUtil.date2String(DateUtil.daysCalculate(new Date(), -1),
-//                            DateUtil.YYYY_MM_DD_DATE_FORMAT) + " 00:00:00")
-//                    .andLessThanOrEqualTo("examineTime",
-//                            DateUtil.date2String(DateUtil.daysCalculate(new Date(), 0),
-//                            DateUtil.YYYY_MM_DD_DATE_FORMAT) + " 00:00:00");
-//
-//            JSONArray array = new JSONArray();
-//            JSONObject object = new JSONObject();
-//            ModelUploadEntity modelUploadEntity = null;
-//            String postfix = "";
-//            List<RenovationPartsDetailEntity> list = renovationPartsDetailService.findAll(condition);
-//            for (RenovationPartsDetailEntity renovationPartsDetailEntity : list) {
-//                modelUploadEntity = modelUploadService.findByPartsDetailId(renovationPartsDetailEntity.getId());
-//                object = new JSONObject();
-//                object.put("Name", renovationPartsDetailEntity.getName());
-//                object.put("UserId", modelUploadEntity.getUserId());
-//                object.put("postfix", modelUploadEntity.getFileType() == 0);
-//                object.put("ObjAliPath", "domain/eHome/furniture/simpleObj-Mtl/" + modelUploadEntity.getFileId());
-//                array.add(object);
-//            }
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            log.error(e.getMessage());
-//        }
-//    }
-//
-//}

+ 0 - 0
src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/0ddb6b40-b7f0-4007-a544-29122b46ad3a.zip


+ 0 - 18
src/main/java/com/sxz/base/service/impl/CompanyServiceImpl.java

@@ -1,18 +0,0 @@
-package com.sxz.base.service.impl;
-
-import com.sxz.base.entity.CompanyEntity;
-import com.sxz.base.mapper.ICompanyMapper;
-import com.sxz.base.service.ICompanyService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Primary;
-import org.springframework.stereotype.Service;
-
-/**
- * Created by Hb_zzZ on 2020/12/24.
- */
-@Service
-public class CompanyServiceImpl extends BaseServiceImpl<ICompanyMapper, CompanyEntity> implements ICompanyService{
-
-
-}

+ 0 - 23
src/test/java/com/sxz/base/HttpTest.java

@@ -1,23 +0,0 @@
-package com.sxz.base;
-
-import com.sxz.base.ChangeingApplication;
-import com.sxz.base.util.OkHttpUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-/**
- * Created by Hb_zzZ on 2020/8/12.
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = ChangeingApplication.class)
-public class HttpTest {
-
-    @Test
-    public void testHttpGet() throws Exception {
-        String s = OkHttpUtils.httpGet("http://189.26.23.53:8080/");
-        System.out.println(s);
-    }
-
-}

+ 0 - 530
src/test/java/com/sxz/base/JunitTest.java

@@ -1,530 +0,0 @@
-package com.sxz.base;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.sxz.base.ChangeingApplication;
-import com.sxz.base.entity.*;
-import com.sxz.base.mapper.IZhiSceneNumMapper;
-import com.sxz.base.service.*;
-import com.sxz.base.util.*;
-import com.sxz.base.vo.response.ResponseRenovationBuild;
-import com.sxz.base.vo.response.ResponseRenovationBuildDetail;
-import com.sxz.base.vo.response.ResponseRenovationParts;
-import com.sxz.base.vo.response.ResponseRenovationPartsDetail;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.io.File;
-import java.util.*;
-
-/**
- * Created by Hb_zzZ on 2020/8/12.
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = ChangeingApplication.class)
-public class JunitTest  {
-
-    @Autowired
-    private UploadToOssUtil uploadToOssUtil;
-
-    @Autowired
-    private IRenovationPartsService renovationPartsService;
-
-    @Autowired
-    private IRenovationPartsTypeService renovationPartsTypeService;
-
-    @Autowired
-    private IRenovationPartsDetailService renovationPartsDetailService;
-
-    @Autowired
-    private IRenovationPartsAttachingService renovationPartsAttachingService;
-
-    @Autowired
-    private IRenovationPartsSizeService renovationPartsSizeService;
-
-    @Autowired
-    private IRenovationBuildService renovationBuildService;
-
-    @Autowired
-    private IRenovationBuildDetailService renovationBuildDetailService;
-
-//    @Autowired
-//    private IAddressMapper addressMapper;
-
-    @Qualifier("IZhiSceneNumMapper")
-    @Autowired
-    private IZhiSceneNumMapper zhiSceneNumMapper;
-
-    @Test
-    public  void insertRenovationParts(){
-        try{
-            String data = FileUtils.readFile("C:\\Users\\hisun\\Downloads\\left(10).json");
-
-            JSONArray array = JSON.parseArray(data);
-            JSONObject object = null;
-            RenovationPartsEntity renovationPartsEntity = null;
-
-            JSONArray typeArray = null;
-            JSONObject typeObject = null;
-            RenovationPartsTypeEntity renovationPartsTypeEntity = null;
-
-            JSONArray detailArray = null;
-            JSONObject detailObject = null;
-            RenovationPartsDetailEntity renovationPartsDetailEntity = null;
-
-            JSONObject editingJson = null;
-            JSONObject sizeJson = null;
-
-            RenovationPartsAttachingEntity renovationPartsAttachingEntity = null;
-            RenovationPartsSizeEntity renovationPartsSizeEntity = null;
-
-            for(int i = 0, len = array.size(); i < len; i++){
-                object = array.getJSONObject(i);
-                renovationPartsEntity = new RenovationPartsEntity();
-                renovationPartsEntity.setName(object.getString("name"));
-                renovationPartsEntity.setDescription(object.getString("text"));
-                renovationPartsEntity.setType(object.getString("type"));
-
-                renovationPartsService.save(renovationPartsEntity);
-
-                typeArray = object.getJSONArray("childrens");
-                for(int j = 0, len1 = typeArray.size(); j < len1; j++){
-                    typeObject = typeArray.getJSONObject(j);
-                    renovationPartsTypeEntity = new RenovationPartsTypeEntity();
-                    renovationPartsTypeEntity.setPartsId(renovationPartsEntity.getId());
-                    renovationPartsTypeEntity.setDescription(typeObject.getString("text"));
-                    renovationPartsTypeEntity.setKeyWord(typeObject.getString("key"));
-                    renovationPartsTypeEntity.setType(typeObject.getString("type"));
-                    renovationPartsTypeEntity.setImg(typeObject.getString("img"));
-                    renovationPartsTypeService.save(renovationPartsTypeEntity);
-
-                    detailArray = typeObject.getJSONArray("childrens");
-                    for (int k = 0, len2 = detailArray.size(); k < len2; k++){
-                        detailObject = detailArray.getJSONObject(k);
-                        renovationPartsDetailEntity = new RenovationPartsDetailEntity();
-                        renovationPartsDetailEntity.setPartsTypeId(renovationPartsTypeEntity.getId());
-                        renovationPartsDetailEntity.setDescription(detailObject.getString("text"));
-                        renovationPartsDetailEntity.setKeyWord(detailObject.getString("key"));
-                        renovationPartsDetailEntity.setType(detailObject.getString("type"));
-                        renovationPartsDetailEntity.setImg(detailObject.getString("img"));
-                        renovationPartsDetailEntity.setHighImg(detailObject.getString("highImg"));
-                        renovationPartsDetailEntity.setPath(detailObject.getString("path"));
-                        renovationPartsDetailEntity.setName(detailObject.getString("name"));
-                        renovationPartsDetailEntity.setZhName(detailObject.getString("zhName"));
-                        renovationPartsDetailService.save(renovationPartsDetailEntity);
-
-                        editingJson = detailObject.getJSONObject("editing");
-                        renovationPartsAttachingEntity = new RenovationPartsAttachingEntity();
-                        renovationPartsAttachingEntity.setPartsDetailId(renovationPartsDetailEntity.getId());
-                        renovationPartsAttachingEntity.setCeilAttaching(editingJson.getBooleanValue("ceilAttaching"));
-                        renovationPartsAttachingEntity.setWallAttaching(editingJson.getBooleanValue("wallAttaching"));
-                        renovationPartsAttachingEntity.setFloorAttaching(editingJson.getBooleanValue("floorAttaching"));
-                        renovationPartsAttachingService.save(renovationPartsAttachingEntity);
-
-                        sizeJson = detailObject.getJSONObject("size");
-                        renovationPartsSizeEntity = new RenovationPartsSizeEntity();
-                        renovationPartsSizeEntity.setPartsDetailId(renovationPartsDetailEntity.getId());
-                        renovationPartsSizeEntity.setX(sizeJson.getIntValue("x"));
-                        renovationPartsSizeEntity.setY(sizeJson.getIntValue("y"));
-                        renovationPartsSizeEntity.setZ(sizeJson.getIntValue("z"));
-                        renovationPartsSizeService.save(renovationPartsSizeEntity);
-                    }
-                }
-            }
-//            JSONObject object = JSON.parseObject(data);
-            System.out.println("添加完成!");
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    public  void insertRenovationBuild(){
-        try{
-            String data = FileUtils.readFile("C:\\Users\\hisun\\Downloads\\result.json");
-
-            JSONArray array = JSON.parseArray(data);
-            JSONObject object = null;
-
-            JSONArray detailArray = null;
-            JSONObject detailObject = null;
-
-            RenovationBuildEntity buildEntity = null;
-            RenovationBuildDetailEntity buildDetailEntity = null;
-            for(int i = 0, len = array.size(); i < len; i++){
-                object = array.getJSONObject(i);
-
-                buildEntity = new RenovationBuildEntity();
-                buildEntity.setName(object.getString("name"));
-                buildEntity.setKeyWord(object.getString("keyword"));
-                renovationBuildService.save(buildEntity);
-
-                detailArray = object.getJSONArray("childrens");
-                for(int j = 0, len1 = detailArray.size(); j < len1; j++){
-                    detailObject = detailArray.getJSONObject(j);
-                    buildDetailEntity = new RenovationBuildDetailEntity();
-                    buildDetailEntity.setBuildId(buildEntity.getId());
-                    buildDetailEntity.setName(detailObject.getString("name"));
-                    buildDetailEntity.setThumbnail(detailObject.getString("thumbnail"));
-                    buildDetailEntity.setOriginImg(detailObject.getString("origin_img"));
-                    buildDetailEntity.setKeyWord(detailObject.getString("keyWord"));
-                    renovationBuildDetailService.save(buildDetailEntity);
-                }
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    public void getRenovationPartsList(){
-        List<ResponseRenovationParts> result = renovationPartsService.getRenovationPartsList();
-
-        System.out.println(JSONArray.toJSON(result));
-    }
-
-    @Test
-    public void getRenovationBuildList(){
-        List<ResponseRenovationBuild> renovationBuildList = renovationBuildService.getRenovationBuildList();
-
-        System.out.println(JSONArray.toJSON(renovationBuildList));
-    }
-
-    @Test
-    public void insertAttachingEntity(){
-
-        for(int i = 493, len = 782; i < len; i++){
-
-            RenovationPartsAttachingEntity renovationPartsAttachingEntity = new RenovationPartsAttachingEntity();
-            renovationPartsAttachingEntity.setPartsDetailId((long)i);
-            renovationPartsAttachingEntity.setCeilAttaching(false);
-            renovationPartsAttachingEntity.setWallAttaching(false);
-            renovationPartsAttachingService.save(renovationPartsAttachingEntity);
-        }
-    }
-
-    @Test
-    public void findZhiSceneNumList(){
-        Set<String> list = zhiSceneNumMapper.findAll();
-
-        System.out.println(list.size());
-
-        Set<String> newNum = new HashSet<>();
-        String num = "";
-        while (true){
-//            num = "zh" + RandomUtil.generateShortUuid();
-            num = RandomUtil.generateShortUuid();
-            if(!list.contains(num)){
-                newNum.add(num);
-            }
-            if(newNum.size() >= 10000){
-                break;
-            }
-        }
-        ZhiSceneNum zhiSceneNum = new ZhiSceneNum();
-        Date createTime = new Date();
-        for(String n : newNum){
-            zhiSceneNum = new ZhiSceneNum();
-            zhiSceneNum.setCode(n);
-            zhiSceneNum.setUsed(0);
-            zhiSceneNum.setUpdateTime(createTime);
-            zhiSceneNum.setCreateTime(createTime);
-//            zhiSceneNumMapper.insertSelective(zhiSceneNum);
-        }
-
-    }
-
-    @Test
-    public void updateJson() throws Exception{
-        String path = "";
-        String lightPath = "F:\\文档\\WeChat Files\\Iove-bing\\FileStorage\\File\\2020-11\\vr-t-ZAuqgFB-004\\decoration.json";
-        String sceneNum = "vr-t-ZAuqgFB-004";
-
-        File file = null;
-        File lightFile = new File(lightPath);
-
-        JSONObject object = null;
-        JSONObject lightObject = null;
-
-        JSONArray furniture = null;
-        JSONArray walls = null;
-        JSONArray rooms = null;
-        JSONArray lights = null;
-        JSONArray windows = null;
-        JSONArray doors = null;
-
-        JSONObject assets = null;
-        JSONArray materials = null;
-        JSONObject wallpaper = null;
-        JSONObject floor = null;
-        JSONObject texture = null;
-
-        String wallpaperStr = "";
-        String textureStr = "";
-
-        ResponseRenovationPartsDetail detail = null;
-        ResponseRenovationBuildDetail buildDetail = null;
-
-        String data = "";
-        if(lightFile.exists()){
-            data = FileUtils.readFile(lightPath);
-            if(data.startsWith("{") && data.endsWith("}")){
-
-                object = JSON.parseObject(data);
-                if(object != null){
-
-                    furniture = object.getJSONArray("furniture");
-                    walls = object.getJSONArray("walls");
-                    rooms = object.getJSONArray("rooms");
-                    lights = object.getJSONArray("lights");
-                    windows = object.getJSONArray("windows");
-                    doors = object.getJSONArray("doors");
-
-                    if(furniture != null){
-
-                        for(int i = 0, len = furniture.size(); i < len; i++){
-                            if(furniture.getJSONObject(i).containsKey("assets")){
-
-                                assets = furniture.getJSONObject(i).getJSONObject("assets");
-                                if(assets.containsKey("name")){
-                                    detail = renovationPartsDetailService.findByName(assets.getString("name"));
-                                    if(detail != null){
-                                        assets.put("previewUrl", detail.getImg());
-                                        assets.put("url", detail.getHighImg());
-                                        assets.put("path", detail.getPath());
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-//                        if(walls != null){
-//
-//                            for(int i = 0, len = walls.size(); i < len; i++){
-//                                if(walls.getJSONObject(i).containsKey("materials") && walls.getJSONObject(i).containsKey("wallpaper")){
-//
-//                                    materials = walls.getJSONObject(i).getJSONArray("materials");
-//                                    for(int j = 0; j < materials.size(); j++){
-//                                        wallpaper = materials.getJSONObject(j).getJSONObject("wallpaper");
-//                                        if(wallpaper.containsKey("name")){
-//                                            buildDetail = buildDetailService.findByName(wallpaper.getString("name"));
-//                                            if(buildDetail != null){
-//                                                wallpaper.put("previewUrl", buildDetail.getThumbnail());
-//                                                wallpaper.put("url", buildDetail.getThumbnail());
-////                                                wallpaper.put("path", buildDetail.getPath());
-//                                            }
-//                                        }
-//                                    }
-//
-//
-//                                }
-//                            }
-//                        }
-//
-//                        if(rooms != null){
-//
-//                            for(int i = 0, len = rooms.size(); i < len; i++){
-//                                if(rooms.getJSONObject(i).containsKey("floor") && rooms.getJSONObject(i).containsKey("texture")){
-//
-//                                    floor = rooms.getJSONObject(i).getJSONObject("floor");
-//                                    texture = floor.getJSONObject("texture");
-//
-//                                    if(texture.containsKey("name")){
-//                                        buildDetail = buildDetailService.findByName(texture.getString("name"));
-//                                        if(buildDetail != null){
-//                                            texture.put("previewUrl", buildDetail.getThumbnail());
-//                                            texture.put("url", buildDetail.getThumbnail());
-////                                            texture.put("path", buildDetail.getPath());
-//                                        }
-//                                    }
-//                                }
-//                            }
-//                        }
-
-                    if(walls != null){
-
-                        for(int i = 0, len = walls.size(); i < len; i++){
-                            if(walls.getJSONObject(i).containsKey("materials")){
-
-                                materials = walls.getJSONObject(i).getJSONArray("materials");
-                                for(int j = 0; j < materials.size(); j++){
-                                    wallpaperStr = materials.getJSONObject(j).getString("wallpaper");
-                                    wallpaper = new JSONObject();
-                                    buildDetail = renovationBuildDetailService.findByName(wallpaperStr);
-//                                        if(wallpaper.containsKey("name")){
-                                    if(buildDetail != null){
-                                        wallpaper.put("previewUrl", buildDetail.getThumbnail());
-                                        wallpaper.put("url", buildDetail.getThumbnail());
-                                        wallpaper.put("name", wallpaperStr);
-                                        wallpaper.put("id", buildDetail.getId());
-//                                                wallpaper.put("path", buildDetail.getPath());
-                                        materials.getJSONObject(j).put("wallpaper", wallpaper);
-                                    }
-//                                        }
-                                }
-
-
-                            }
-                        }
-                    }
-
-                    if(rooms != null){
-
-                        for(int i = 0, len = rooms.size(); i < len; i++){
-                            if(rooms.getJSONObject(i).containsKey("floor") ){
-
-                                floor = rooms.getJSONObject(i).getJSONObject("floor");
-                                textureStr = floor.getString("texture");
-                                texture = new JSONObject();
-
-                                buildDetail = renovationBuildDetailService.findByName(textureStr);
-//                                    if(texture.containsKey("name")){
-                                if(buildDetail != null){
-                                    texture.put("previewUrl", buildDetail.getThumbnail());
-                                    texture.put("url", buildDetail.getThumbnail());
-                                    texture.put("id", buildDetail.getId());
-                                    texture.put("name", textureStr);
-//                                            texture.put("path", buildDetail.getPath());
-                                    floor.put("texture", texture);
-                                }
-//                                    }
-                            }
-                        }
-                    }
-
-                    if(lights != null){
-
-                        for(int i = 0, len = lights.size(); i < len; i++){
-                            if(lights.getJSONObject(i).containsKey("assets")){
-
-                                assets = lights.getJSONObject(i).getJSONObject("assets");
-                                if(assets.containsKey("name")){
-                                    detail = renovationPartsDetailService.findByName(assets.getString("name"));
-                                    if(detail != null){
-                                        assets.put("previewUrl", detail.getImg());
-                                        assets.put("url", detail.getHighImg());
-                                        assets.put("path", detail.getPath());
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    if(windows != null){
-
-                        for(int i = 0, len = windows.size(); i < len; i++){
-                            if(windows.getJSONObject(i).containsKey("assets")){
-
-                                assets = windows.getJSONObject(i).getJSONObject("assets");
-                                if(assets.containsKey("name")){
-                                    detail = renovationPartsDetailService.findByName(assets.getString("name"));
-                                    if(detail != null){
-                                        assets.put("previewUrl", detail.getImg());
-                                        assets.put("url", detail.getHighImg());
-                                        assets.put("path", detail.getPath());
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    if(doors != null){
-                        for(int i = 0, len = doors.size(); i < len; i++){
-                            if(doors.getJSONObject(i).containsKey("assets")){
-
-                                assets = doors.getJSONObject(i).getJSONObject("assets");
-                                if(assets.containsKey("name")){
-                                    detail = renovationPartsDetailService.findByName(assets.getString("name"));
-                                    if(detail != null){
-                                        assets.put("previewUrl", detail.getImg());
-                                        assets.put("url", detail.getHighImg());
-                                        assets.put("path", detail.getPath());
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    FileUtils.writeFile(lightPath.replace("decoration.json", "decorationBack.json"), object.toString(SerializerFeature.WriteMapNullValue));
-                    uploadToOssUtil.upload(lightPath.replace("decoration.json", "decorationBack.json"),
-                            "data/data" + sceneNum + "/changeData/decoration.json");
-                }
-            }
-//        }
-
-//            FileUtils.writeFile(lightPath, object.toJSONString());
-//            uploadToOssUtil.upload(buildPath + sceneStyleEntity.getStyleNum() + "light/decoration.json",
-//                    "data/data" + sceneStyleEntity.getStyleNum() + "/proLightData/decoration.json");
-        }
-    }
-
-    @Test
-    public void openUrl(){
-        Set<String> set = new HashSet<>();
-
-        for (String s : set) {
-            System.out.println(s);
-        }
-
-//        System.out.println(OkHttpUtils.httpGet("https://wenku.baidu.com/view/3572a0bcce7931b765ce0508763231126edb77e9.html"));
-    }
-
-//    @Test
-//    public void importData(){
-//        ImportExeclUtil poi = new ImportExeclUtil();
-//        List<List<String>> list = poi.read("C:\\Users\\hisun\\Downloads\\江门_二标四实\\户室.xlsx");
-//
-////        AddressEntity addressEntity = null;
-////        if (list != null) {
-////            for (int i = 0; i < list.size(); i++) {
-////                List<String> cellList = list.get(i);
-////                if(i == 0){
-////                    continue;
-////                }
-////
-////                addressEntity = new AddressEntity();
-////                addressEntity.setId(cellList.get(0).toString().trim());
-////                addressEntity.setLongitude(cellList.get(1).toString().trim());
-////                addressEntity.setLatitude(cellList.get(2).toString().trim());
-////                addressEntity.setAddressName(cellList.get(3).toString().trim());
-////                addressEntity.setStandardAddress(cellList.get(4).toString().trim());
-////                addressEntity.setMainNumber(cellList.get(5).toString().trim());
-////                addressEntity.setAuxiliaryNumber(cellList.get(6).toString().trim());
-////                addressEntity.setBuildNumber(cellList.get(7).toString().trim());
-////                addressEntity.setBuildUnits(cellList.get(8).toString().trim());
-////                addressMapper.saveAddress(addressEntity);
-////            }
-////
-////        }
-//
-//        HouseholdEntity householdEntity = null;
-//        if (list != null) {
-//            for (int i = 0; i < list.size(); i++) {
-//                List<String> cellList = list.get(i);
-//                if(i == 0){
-//                    continue;
-//                }
-//
-//                householdEntity = new HouseholdEntity();
-//                householdEntity.setId(cellList.get(0).toString().trim());
-//                householdEntity.setAddressId(cellList.get(1).toString().trim());
-//                householdEntity.setName(cellList.get(2).toString().trim());
-//                householdEntity.setFloor(cellList.get(3).toString().trim());
-//                householdEntity.setUnit(cellList.get(4).toString().trim());
-//                householdEntity.setFloorAbbreviation(cellList.get(5).toString().trim());
-//                householdEntity.setUnitAbbreviation(cellList.get(6).toString().trim());
-//                householdEntity.setAddressMsg(cellList.get(7).toString().trim());
-//                addressMapper.saveHousehold(householdEntity);
-//            }
-//
-//        }
-//
-//    }
-
-}

+ 80 - 0
sxz-application/pom.xml

@@ -0,0 +1,80 @@
+<?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>
+
+    <parent>
+        <groupId>com.fdkk</groupId>
+        <artifactId>changeing</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>com.fdkk</groupId>
+    <artifactId>sxz-application</artifactId>
+    <version>1.0.0</version>
+    <name>sxz-application</name>
+    <description>sxz-application</description>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fdkk</groupId>
+            <artifactId>sxz-modules</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fdkk</groupId>
+            <artifactId>sxz-base</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fdkk</groupId>
+            <artifactId>sxz-common</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fdkk</groupId>
+            <artifactId>sxz-core</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+    </dependencies>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <failOnMissingWebXml>false</failOnMissingWebXml>
+    </properties>
+    <build>
+        <finalName>changeing</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <!-- 指定该Main Class为全局的唯一入口 -->
+                    <mainClass>com.fdkk.sxz.ChangeingApplication</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>

+ 1 - 1
src/main/java/com/sxz/base/ChangeingApplication.java

@@ -1,4 +1,4 @@
-package com.sxz.base;
+package com.fdkk.sxz;
 
 import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;
 import org.springframework.boot.SpringApplication;

+ 2 - 2
src/main/resources/application-dev.properties

@@ -1,9 +1,9 @@
 server.file.location=E:\\Downloads
 upload.file.location=${server.file.location}/upload/
 #log
-logging.file.path=E:/prox/changeing/logs
+logging.file.path=E:/prox/sxz/logs
 logging.config=classpath:logback-spring.xml
-logging.level.com.sxz=debug
+logging.level.com.fdkk=debug
 #thymeleaf配置
 spring.thymeleaf.enabled=true
 spring.thymeleaf.prefix=classpath:/templates/

+ 1 - 1
src/main/resources/application-prod.properties

@@ -3,7 +3,7 @@ upload.file.location=${server.file.location}upload/
 #log
 logging.file.path=/mnt/change/logs/
 logging.config=classpath:logback-spring.xml
-logging.level.com.sxz=debug
+logging.level.com.fdkk=debug
 #thymeleaf配置
 spring.thymeleaf.enabled=true
 spring.thymeleaf.prefix=classpath:/templates/

+ 1 - 1
src/main/resources/application-uat.properties

@@ -3,7 +3,7 @@ upload.file.location=${server.file.location}upload/
 #log
 logging.file.path=/mnt/change/logs/
 logging.config=classpath:logback-spring.xml
-logging.level.com.sxz=debug
+logging.level.com.fdkk=debug
 #thymeleaf配置
 spring.thymeleaf.enabled=true
 spring.thymeleaf.prefix=classpath:/templates/

src/main/resources/application.properties → sxz-application/src/main/resources/application.properties


+ 1 - 1
src/main/resources/logback-spring.xml

@@ -13,7 +13,7 @@
     </appender>
 
     <!-- 自定义Appender -->
-    <appender name="logAd" class="com.sxz.base.logging.LogAppender">
+    <appender name="logAd" class="com.fdkk.sxz.logging.LogAppender">
         <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>

src/main/resources/templates/logList.html → sxz-application/src/main/resources/templates/logList.html


+ 273 - 0
sxz-base/pom.xml

@@ -0,0 +1,273 @@
+<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.fdkk</groupId>
+    <artifactId>sxz-base</artifactId>
+    <version>1.0.0</version>
+    <name>sxz-base</name>
+    <description>sxz-base</description>
+    <packaging>jar</packaging>
+
+    <parent>
+        <artifactId>changeing</artifactId>
+        <groupId>com.fdkk</groupId>
+        <version>1.0.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <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>
+        <!--rabbitmq-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+
+        <!-- swagger -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.200</version>
+            <scope>runtime</scope>
+        </dependency>
+        <!-- 代码生成器  依赖 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
+        <!-- pagehelper 依赖 -->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+        </dependency>
+        <!-- 					-->
+
+        <dependency>
+            <groupId>com.github.jsqlparser</groupId>
+            <artifactId>jsqlparser</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+        </dependency>
+
+        <!-- mysql -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <!-- druid -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <!-- fastjson -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+        <!--Jackson required包-->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-annotations</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.protobuf-java-format</groupId>
+            <artifactId>protobuf-java-format</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-smile</artifactId>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.aliyun/aliyun-java-sdk-ossadmin -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-ossadmin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+        </dependency>
+
+        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+        </dependency>
+
+        <!-- 解压rar -->
+        <dependency>
+            <groupId>com.github.junrar</groupId>
+            <artifactId>junrar</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sf.json-lib</groupId>
+            <artifactId>json-lib</artifactId>
+            <classifier>jdk15</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
+
+        <!--lettuce-->
+        <!--redis 相关  依赖-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+
+        <!-- lettuce pool 缓存连接池 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+        </resources>
+    </build>
+
+</project>

+ 2 - 2
src/main/java/com/sxz/base/listener/OkHttpLogInterceptor.java

@@ -1,4 +1,4 @@
-package com.sxz.base.listener;
+package com.fdkk.sxz.Interceptor;
 
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.Interceptor;
@@ -16,7 +16,7 @@ public class OkHttpLogInterceptor implements Interceptor {
     public Response intercept(@NotNull Chain chain) throws IOException {
         long startTime = System.currentTimeMillis();
         log.info("----------Start-OkHttp----------------");
-        okhttp3.Response response = chain.proceed(chain.request());
+        Response response = chain.proceed(chain.request());
         long endTime = System.currentTimeMillis();
         long duration = endTime - startTime;
         okhttp3.MediaType mediaType = response.body().contentType();

+ 3 - 5
src/main/java/com/sxz/base/config/MyBatisPlusConfig.java

@@ -1,19 +1,17 @@
-package com.sxz.base.config;
+package com.fdkk.sxz.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-
-import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
-import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
 @EnableTransactionManagement
-@MapperScan("com.sxz.**.mapper")
+@MapperScan("com.fdkk.**.mapper")
 public class MyBatisPlusConfig {
     /*
      * 分页插件,自动识别数据库类型

+ 1 - 1
src/main/java/com/sxz/base/config/PageHelperAutoConfiguration.java

@@ -1,4 +1,4 @@
-package com.sxz.base.config;
+package com.fdkk.sxz.config;
 
 
 import com.github.pagehelper.PageInterceptor;

+ 1 - 1
src/main/java/com/sxz/base/constant/CodeConstant.java

@@ -1,5 +1,5 @@
 
-package com.sxz.base.constant;
+package com.fdkk.sxz.constant;
 
 // 5001-6000 场景状态码
 public class CodeConstant {

+ 1 - 1
src/main/java/com/sxz/base/constant/ConstantFileName.java

@@ -1,4 +1,4 @@
-package com.sxz.base.constant;
+package com.fdkk.sxz.constant;
 
 public class ConstantFileName {
     //背景音乐

+ 1 - 1
src/main/java/com/sxz/base/constant/ConstantFilePath.java

@@ -1,4 +1,4 @@
-package com.sxz.base.constant;
+package com.fdkk.sxz.constant;
 
 public class ConstantFilePath {
     public static final String BASE_PATH = "/mnt/4Dkankan";

+ 1 - 1
src/main/java/com/sxz/base/constant/PathConfig.java

@@ -1,4 +1,4 @@
-package com.sxz.base.constant;
+package com.fdkk.sxz.constant;
 
 public class PathConfig
 {

+ 1 - 1
src/main/java/com/sxz/base/constant/Variable.java

@@ -1,4 +1,4 @@
-package com.sxz.base.constant;
+package com.fdkk.sxz.constant;
 
 import java.util.concurrent.ConcurrentLinkedQueue;
 

+ 3 - 3
src/main/java/com/sxz/base/controller/BaseController.java

@@ -1,10 +1,10 @@
-package com.sxz.base.controller;
+package com.fdkk.sxz.controller;
 
 import cn.hutool.core.io.IoUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.sxz.base.util.IPUtil;
-import com.sxz.base.util.Result;
+import com.fdkk.sxz.util.IPUtil;
+import com.fdkk.sxz.util.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 

+ 4 - 4
src/main/java/com/sxz/base/jumi/JUMILoader.java

@@ -16,11 +16,11 @@
  * Lesser General Public License for more details.
  *
  */
-package com.sxz.base.jumi;
+package com.fdkk.sxz.jumi;
 
-import com.sxz.base.constant.PathConfig;
-import com.sxz.base.jumi.obj.OBJLoader;
-import com.sxz.base.jumi.scene.JUMIScene;
+import com.fdkk.sxz.constant.PathConfig;
+import com.fdkk.sxz.jumi.obj.OBJLoader;
+import com.fdkk.sxz.jumi.scene.JUMIScene;
 
 import java.io.*;
 

src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/thumbnail.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/23.4dage


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mesh0.dat → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/23.obj


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/23.obj.mtl → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/23.obj.mtl


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat9_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/3d66Model-515617-1-11.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat9_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/first/23.mtl


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat9_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/first/23.obj


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat8_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat0_a.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat8_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat0_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat8_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat0_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat0_n.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat0_n.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat0_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat0_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat10_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat10_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat10_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat10_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat10_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat10_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat11_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat11_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat11_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat11_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat11_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat11_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat12_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat12_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat12_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat12_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat12_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat12_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat13_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat13_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat13_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat13_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat13_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat13_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat14_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat14_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat14_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat14_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat14_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat14_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat15_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat15_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat15_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat15_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat15_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat15_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat16_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat16_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat16_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat16_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat16_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat16_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat17_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat17_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat17_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat17_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat17_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat17_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat18_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat18_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat18_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat18_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat18_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat18_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat19_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat19_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat19_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat19_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat19_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat19_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat1_a.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat1_a.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat1_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat1_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat1_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat1_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat1_n.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat1_n.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat1_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat1_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat20_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat20_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat20_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat20_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat20_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat20_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat21_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat21_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat21_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat21_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat21_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat21_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat22_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat22_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat22_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat22_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat22_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat22_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat23_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat23_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat23_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat23_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat23_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat23_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat24_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat24_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat24_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat24_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat24_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat24_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat25_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat25_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat25_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat25_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat25_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat25_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat26_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat26_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat26_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat26_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat26_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat26_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat27_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat27_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat27_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat27_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat27_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat27_r.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat28_c.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat28_c.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat28_g.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat28_g.jpg


src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat28_r.jpg → sxz-base/src/main/java/com/fdkk/sxz/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat28_r.jpg


+ 0 - 0
src/main/java/com/sxz/base/jumi/data/0ddb6b40-b7f0-4007-a544-29122b46ad3a/mat29_c.jpg


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä