2021年6月9日-配置整改2

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

@@ -1,5 +1,3 @@
-#应用名
-spring.application.name=4dkankan-scene
 #注册中心
 spring.cloud.nacos.discovery.server-addr=8.135.98.231:8848
 spring.cloud.nacos.discovery.namespace=31b3ac3b-ba06-4be7-9cbf-69a8df190dfe

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

@@ -1,5 +1,4 @@
-#应用名
-spring.application.name=4dkankan-scene
+
 #注册中心
 spring.cloud.nacos.discovery.server-addr=10.71.9.205:80
 

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

@@ -1,13 +1,12 @@
-#应用名
-spring.application.name=4dkankan-scene
+
 #注册中心
-spring.cloud.nacos.discovery.server-addr=10.71.5.163:80
+spring.cloud.nacos.discovery.server-addr=127.0.0.1:80
 
 #DB (new)
-spring.datasource.primary.url=jdbc:mysql://10.71.184.146:3306/db_4dkankan?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.primary.username=user_4dkankan_rw
-spring.datasource.primary.password=y2b9a42wRwGNKkJjCm1o
-spring.datasource.primary.driverClassName=com.mysql.jdbc.Driver
+spring.datasource.primary.url=jdbc:mysql://127.0.0.1:3306/db_4dkankan?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
@@ -42,9 +41,9 @@ swagger.version=2.0
 #rabbitmq
 #spring.rabbitmq.host=8.135.98.231
 #spring.rabbitmq.port=30672
-spring.rabbitmq.address=10.71.5.163:5672,10.71.5.164: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模式
@@ -72,7 +71,7 @@ scene.pro.new.url=smobile.html?m=
 prefix.ali=https://fcb-vrkanfang-uat.os-cn-shenzhen.aliyuncs.com/
 
 #服务器环境，dev为测试环境，formal为正式环境
-environment=dev
+environment=test
 
 #mq的任务key
 rabbitmq.queue=QUEUE_MODELING_A

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

@@ -0,0 +1,96 @@
+
+#注册中心
+spring.cloud.nacos.discovery.server-addr=10.71.5.163:80
+
+#DB (new)
+spring.datasource.primary.url=jdbc:mysql://10.71.184.146:3306/db_4dkankan?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.primary.username=user_4dkankan_rw
+spring.datasource.primary.password=y2b9a42wRwGNKkJjCm1o
+spring.datasource.primary.driverClassName=com.mysql.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.184.237:7000,10.71.184.181:7000,10.71.184.217:7000,10.71.184.188:7000,10.71.184.222:7000,10.71.184.200:7000
+spring.redis.database=0
+spring.redis.password=QBzhHTxfcYLTs0n5J5VQ
+spring.redis.timeout=3000ms
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.min-idle=0
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-wait=-1ms
+# file route
+file.route.hardDisk=/mnt/data/
+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=四维看看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.5.163:5672,10.71.5.164:5672
+spring.rabbitmq.username=admin
+spring.rabbitmq.password=fcb@admin_4dage
+spring.rabbitmq.virtual-host=/
+spring.rabbitmq.connection-timeout=15000
+#confirm模式
+spring.rabbitmq.publisher-confirms=true
+#return机制
+spring.rabbitmq.publisher-returns=true
+#与return机制结合配置次属性
+spring.rabbitmq.template.mandatory=true
+
+spring.mvc.static-path-pattern=/**
+spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/, classpath:/static/, classpath:/web/, file:${server.file.location}
+
+oss.point=http://oss-cn-shenzhen-internal.aliyuncs.com
+oss.key=LTAI4FyDDFpGGjTJZEQH4yaK
+oss.secrey=mqVRTWbWcn4sNMoWmnRq6eToWr9BIy
+oss.bucket=fcb-vrkanfang-uat
+oss.type=oss
+
+main.url=https://vr-web01-uat-fcb.com.cn/
+main.intranet.url=https://vr-mc01-uat-fcb.com/
+scene.url=show.html?m=
+scene.pro.url=showProMobile.html?m=
+scene.pro.new.url=smobile.html?m=
+
+prefix.ali=https://fcb-vrkanfang-uat.os-cn-shenzhen.aliyuncs.com/
+
+#服务器环境，dev为测试环境，formal为正式环境
+environment=dev
+
+#mq的任务key
+rabbitmq.queue=QUEUE_MODELING_A
+#mq当排队任务超过这个数量时启用弹性升缩
+mq.base.num=300
+#弹性伸缩组id
+scaling.group.id=asg-wz92989gdhgek3ktdlsw
+#弹性伸缩规则id
+scaling.rule.ari=ari:acs:ess:cn-shenzhen:1899912233141089:scalingrule/asr-wz97gv4s2nod1cxznynx
+
+#服务器类型，aliyun或hqyun
+ecs.type=aliyun
+
+knife4j.basic.enable=true
+knife4j.basic.username=apiadmin
+knife4j.basic.password=fdkankancui
+
+#log
+logging.path=/4Dkankan/logs/
+logging.config=classpath:logback-spring.xml
+logging.level.com.fdkankan=debug
+

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

@@ -1,4 +1,8 @@
 server.port=8020
+
+#应用名
+spring.application.name=4dkankan-scene
+
 server.servlet.context-path=/4dkankan_v2
 server.file.location=/mnt/4Dkankan/
 

4dkankan-base/src/main/java/com/fdkankan/base/config/KankanGlobalConfig.java

@@ -0,0 +1,23 @@
+package com.fdkankan.base.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+/**
+ * 全局配置
+ * @author zhujh
+ */
+@Configuration
+@PropertySource("classpath:base.properties")
+@Data
+public class KankanGlobalConfig {
+
+    /**
+     * 是否打开鉴权
+     */
+    @Value("${isOpenAuth}")
+    private Boolean isOpenAuth;
+
+}

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

@@ -0,0 +1,2 @@
+#权限校验开关
+isOpenAuth = true

4dkankan-web/src/main/java/com/fdkankan/web/aop/CheckCurrenUserAspect.java

@@ -1,11 +1,11 @@
 package com.fdkankan.web.aop;
 
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.base.config.KankanGlobalConfig;
 import com.fdkankan.base.constant.SceneConstant;
 import com.fdkankan.common.exception.BaseRuntimeException;
-import com.fdkankan.scene.entity.CameraEntity;
-import com.fdkankan.scene.service.ICameraService;
 import com.fdkankan.scene.entity.SceneProEntity;
+import com.fdkankan.scene.service.ICameraService;
 import com.fdkankan.scene.service.ISceneProService;
 import com.github.pagehelper.util.StringUtil;
 import lombok.extern.log4j.Log4j2;
@@ -36,12 +36,16 @@ public class CheckCurrenUserAspect {
 
 	@Autowired
 	private ISceneProService sceneProService;
+
 	@Autowired
 	private ICameraService cameraService;
 
 	@Autowired
 	private RedisTemplate<String, String> redisTemplate;
 
+	@Autowired
+	private KankanGlobalConfig kankanGlobalConfig;
+
 
 	// Service层切点
 	@Pointcut("@annotation(com.fdkankan.web.aop.CheckCurrentUser)")
@@ -57,6 +61,11 @@ public class CheckCurrenUserAspect {
 	 */
 	@Before("checkUserAspect()")
 	public void doBefore(JoinPoint joinPoint) throws Exception {
+		// 本地调试不需要鉴权
+		if (!kankanGlobalConfig.getIsOpenAuth()) {
+			return;
+		}
+
 		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
 				.getRequest();
 		// 读取session中的用户

4dkankan-web/src/main/java/com/fdkankan/web/aop/WebLogAspect.java

@@ -2,6 +2,7 @@ package com.fdkankan.web.aop;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.base.config.KankanGlobalConfig;
 import com.fdkankan.common.vo.request.RequestOperation;
 import com.fdkankan.scene.feign.OperatorFeign;
 import lombok.extern.slf4j.Slf4j;
@@ -35,11 +36,20 @@ public class WebLogAspect {
     @Autowired
     private OperatorFeign operatorFeign;
 
+    @Autowired
+    private KankanGlobalConfig kankanGlobalConfig;
+
+
     @Pointcut("@annotation(com.fdkankan.web.aop.WebControllerLog)")//切入点描述 这个是controller包的切入点
     public void controllerLog(){}//签名，可以理解成这个切入点的一个名称
 
     @Before("controllerLog()") //在切入点的方法run之前要干的
     public void logBeforeController(JoinPoint joinPoint) throws Exception{
+        // 本地调试不需要记录日志
+        if (!kankanGlobalConfig.getIsOpenAuth()) {
+            return;
+        }
+
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
                 .getRequest();