2021年6月9日-配置整改

.gitignore

@@ -0,0 +1,41 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Java template
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+*.iml
+out
+gen
+/4dkankan-application/target/
+/4dkankan-base/target/
+/4dkankan-common/target/
+/4dkankan-modeling/target/
+/4dkankan-scene/target/
+/4dkankan-web/target/
+

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

@@ -1,19 +1,14 @@
 package com.fdkankan;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.web.bind.annotation.RestController;
 
 
 @EnableFeignClients
@@ -23,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController;
 @EnableScheduling
 @EnableAsync
 //@RestController
-@ComponentScan(basePackages = {"com.oxing.mall","com.oxing.blog"})
 public class App extends SpringBootServletInitializer {
 
     @Override

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

@@ -1,22 +1,23 @@
 #应用名
 spring.application.name=4dkankan-scene
 #注册中心
-spring.cloud.nacos.discovery.server-addr=10.71.114.232:8848
+spring.cloud.nacos.discovery.server-addr=8.135.98.231:8848
+spring.cloud.nacos.discovery.namespace=31b3ac3b-ba06-4be7-9cbf-69a8df190dfe
 
 #DB (new)
-spring.datasource.primary.url=jdbc:mysql://10.71.114.237:3306/db_4dkankan?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.primary.username=user_4dhouse_rw
-spring.datasource.primary.password=kaKjbpZi1plmViyDVWhD!a
-spring.datasource.primary.driverClassName=com.mysql.jdbc.Driver
+spring.datasource.primary.url=jdbc:mysql://8.135.107.23:3306/4dkankan_hd?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.primary.username=root
+spring.datasource.primary.password=4DAGE168!a
+spring.datasource.primary.driverClassName=com.mysql.cj.jdbc.Driver
 
 spring.servlet.multipart.max-file-size=500MB
 spring.servlet.multipart.max-request-size=1000MB
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.location=/mnt/data/
 #redis
-spring.redis.cluster.nodes=10.71.114.132:7000,10.71.114.132:7001,10.71.114.132:7002,10.71.114.132:7003,10.71.114.132:7004,10.71.114.132:7005
+spring.redis.host=8.135.107.23
+spring.redis.port=30064
 spring.redis.database=0
-spring.redis.password=BN5Q40JsPHIGfUg5HTkU
 spring.redis.timeout=3000ms
 spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
@@ -34,17 +35,12 @@ file.route.videoType=[".mp4", ".avi", ".mov", ".wmv", ".asf", ".navi", ".3gp", "
 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=四维看看2.0单机版
-swagger.description=api文档
-swagger.serviceUrl=http://39.108.220.65:8080
-swagger.version=2.0
 #rabbitmq
 #spring.rabbitmq.host=8.135.98.231
 #spring.rabbitmq.port=30672
-spring.rabbitmq.address=10.71.114.232:5672
-spring.rabbitmq.username=admin
-spring.rabbitmq.password=fcb@admin_4dage
+spring.rabbitmq.address=8.135.107.23:30672
+spring.rabbitmq.username=root
+spring.rabbitmq.password=root
 spring.rabbitmq.virtual-host=/
 spring.rabbitmq.connection-timeout=15000
 #confirm模式
@@ -86,9 +82,10 @@ scaling.rule.ari=ari:acs:ess:cn-shenzhen:1899912233141089:scalingrule/asr-wz9gh8
 #服务器类型，aliyun或hqyun
 ecs.type=aliyun
 
-knife4j.basic.enable=true
-knife4j.basic.username=apiadmin
-knife4j.basic.password=fdkankancui
+swagger.page.title=房车宝
+swagger.page.version=1.0
+swagger.page.desc=...
+swagger.page.packagePath=com.fdkankan.web
 
 #log
 logging.path=/4Dkankan/logs/

4dkankan-common/src/main/java/com/fdkankan/common/util/PushMsgUtil.java

@@ -18,7 +18,6 @@ import org.apache.commons.codec.digest.DigestUtils;
 import java.io.FileInputStream;
 import java.util.ArrayList;
 
-import static org.reflections.util.ConfigurationBuilder.build;
 
 /**
  * Created by Hb_zzZ on 2020/7/27.

4dkankan-modeling/src/main/java/com/fdkankan/ModelingApplication.java

@@ -7,6 +7,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.bind.annotation.RestController;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 @EnableScheduling
 @EnableAsync
 @RestController
+@EnableFeignClients
 //@EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class})
 public class ModelingApplication  extends SpringBootServletInitializer {
 

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

@@ -1,22 +1,23 @@
 #应用名
 spring.application.name=4dkankan-model
 #注册中心
-spring.cloud.nacos.discovery.server-addr=10.71.114.232:8848
+spring.cloud.nacos.discovery.server-addr=8.135.98.231:8848
+spring.cloud.nacos.discovery.namespace=31b3ac3b-ba06-4be7-9cbf-69a8df190dfe
 
 #DB (new)
-spring.datasource.primary.url=jdbc:mysql://10.71.114.237:3306/db_4dkankan?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.primary.username=user_4dhouse_rw
-spring.datasource.primary.password=kaKjbpZi1plmViyDVWhD
-spring.datasource.primary.driverClassName=com.mysql.jdbc.Driver
+spring.datasource.primary.url=jdbc:mysql://8.135.107.23:3306/4dkankan_hd?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.primary.username=root
+spring.datasource.primary.password=4DAGE168!a
+spring.datasource.primary.driverClassName=com.mysql.cj.jdbc.Driver
 
 spring.servlet.multipart.max-file-size=500MB
 spring.servlet.multipart.max-request-size=1000MB
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.location=/mnt/data/
 #redis
-spring.redis.cluster.nodes=10.71.114.132:7000,10.71.114.132:7001,10.71.114.132:7002,10.71.114.132:7003,10.71.114.132:7004,10.71.114.132:7005
+spring.redis.host=8.135.107.23
+spring.redis.port=30064
 spring.redis.database=0
-spring.redis.password=BN5Q40JsPHIGfUg5HTkU
 spring.redis.timeout=3000ms
 spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.min-idle=0
@@ -42,9 +43,9 @@ swagger.version=2.0
 #rabbitmq
 #spring.rabbitmq.host=8.135.98.231
 #spring.rabbitmq.port=30672
-spring.rabbitmq.address=10.71.114.232:5672
-spring.rabbitmq.username=admin
-spring.rabbitmq.password=fcb@admin_4dage
+spring.rabbitmq.address=8.135.107.23:30672
+spring.rabbitmq.username=root
+spring.rabbitmq.password=root
 spring.rabbitmq.virtual-host=/
 spring.rabbitmq.connection-timeout=15000
 #confirm模式

4dkankan-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -10,7 +10,6 @@ import com.fdkankan.base.service.impl.BaseServiceImpl;
 import com.fdkankan.base.util.ConvertUtils;
 import com.fdkankan.common.constant.ConstantFileName;
 import com.fdkankan.common.constant.ConstantFilePath;
-import com.fdkankan.common.constant.ConstantUrl;
 import com.fdkankan.common.exception.BaseRuntimeException;
 import com.fdkankan.common.model.Result;
 import com.fdkankan.common.util.DateUtil;
@@ -26,7 +25,6 @@ import com.fdkankan.scene.entity.CameraEntity;
 import com.fdkankan.scene.entity.SceneProEditEntity;
 import com.fdkankan.scene.entity.SceneProEntity;
 import com.fdkankan.scene.feign.DepartmentFeign;
-import com.fdkankan.scene.mapper.ICameraMapper;
 import com.fdkankan.scene.mapper.ISceneProEditMapper;
 import com.fdkankan.scene.mapper.ISceneProMapper;
 import com.fdkankan.scene.service.ICameraService;
@@ -46,16 +44,10 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
 import tk.mybatis.mapper.entity.Condition;
 
-import java.io.BufferedInputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Created by Hb_zzZ on 2019/7/23.

pom.xml

@@ -108,7 +108,7 @@
 
         <shiro.version>1.2.4</shiro.version>
         <snakeyaml.version>1.24</snakeyaml.version>
-        <swagger.version>2.8.0</swagger.version>
+        <swagger.version>2.9.2</swagger.version>
 
         <tk.mybatis.version>2.0.2</tk.mybatis.version>