注释了生产环境禁止访问文档

gis_application/src/main/resources/application-dev.properties

@@ -6,21 +6,21 @@ spring.datasource.druid.username=root
 spring.datasource.druid.password=root
 
 
-# 初始连接数
+# \uFFFD\uFFFD\u02BC\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 spring.datasource.druid.initial-size=5
-# 最小连接池数量
+# \uFFFD\uFFFD\u0421\uFFFD\uFFFD\uFFFD\u04F3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 spring.datasource.druid.min-idle=10
-# 最大连接池数量
+# \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04F3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 spring.datasource.druid.max-active=20
-# 配置获取连接等待超时的时间
+# \uFFFD\uFFFD\uFFFD\u00FB\uFFFD\u0221\uFFFD\uFFFD\uFFFD\u04F5\u0234\uFFFD\uFFFD\uFFFD\u02B1\uFFFD\uFFFD\u02B1\uFFFD\uFFFD
 spring.datasource.druid.max-wait=60000
-# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+# \uFFFD\uFFFD\uFFFD\u00FC\uFFFD\uFFFD\uFFFD\uFFFD\u00F2\u017D\uFFFD\uFFFD\uFFFD\u04BB\uFFFD\u03BC\uFFFD\u28EC\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04AA\uFFFD\u0631\u0575\u013F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04E3\uFFFD\uFFFD\uFFFD\u03BB\uFFFD\u01FA\uFFFD\uFFFD\uFFFD
 spring.datasource.druid.time-between-eviction-runs-millis=60000
-# 配置一个连接在池中最小生存的时间，单位是毫秒
+# \uFFFD\uFFFD\uFFFD\uFFFD\u04BB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u06B3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0421\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02B1\uFFFD\u48EC\uFFFD\uFFFD\u03BB\uFFFD\u01FA\uFFFD\uFFFD\uFFFD
 spring.datasource.druid.min-evictable-idle-time-millis=30000
-# 配置一个连接在池中最大生存的时间，单位是毫秒
+# \uFFFD\uFFFD\uFFFD\uFFFD\u04BB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u06B3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02B1\uFFFD\u48EC\uFFFD\uFFFD\u03BB\uFFFD\u01FA\uFFFD\uFFFD\uFFFD
 spring.datasource.druid.max-evictable-idle-time-millis=90000
-# 配置检测连接是否有效
+# \uFFFD\uFFFD\uFFFD\u00FC\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u01F7\uFFFD\uFFFD\uFFFD\u0427
 spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
 spring.datasource.druid.test-while-idle=true
 spring.datasource.druid.test-on-borrow=false
@@ -29,20 +29,20 @@ spring.datasource.druid.web-stat-filter.enabled=true
 spring.datasource.druid.stat-view-servlet.enabled=true
 
 
-# Redis数据库索引（默认为0）
+# Redis\uFFFD\uFFFD\uFFFD\u077F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u012C\uFFFD\uFFFD\u03AA0\uFFFD\uFFFD
 spring.redis.database=0
 spring.redis.host=127.0.0.1
 spring.redis.port=6379
 spring.redis.password=
-# 连接超时时间 单位 ms（毫秒）
+# \uFFFD\uFFFD\uFFFD\u04F3\uFFFD\u02B1\u02B1\uFFFD\uFFFD \uFFFD\uFFFD\u03BB ms\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uB8E9
 spring.redis.timeout=3000ms
-# 连接池中的最大空闲连接，默认值也是8。
+# \uFFFD\uFFFD\uFFFD\u04F3\uFFFD\uFFFD\u0435\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04E3\uFFFD\u012C\uFFFD\uFFFD\u05B5\u04B2\uFFFD\uFFFD8\uFFFD\uFFFD
 spring.redis.jedis.pool.max-idle=8
-#连接池中的最小空闲连接，默认值也是0。
+#\uFFFD\uFFFD\uFFFD\u04F3\uFFFD\uFFFD\u0435\uFFFD\uFFFD\uFFFD\u0421\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04E3\uFFFD\u012C\uFFFD\uFFFD\u05B5\u04B2\uFFFD\uFFFD0\uFFFD\uFFFD
 spring.redis.jedis.pool.min-idle=0
-# 如果赋值为-1，则表示不限制；如果pool已经分配了maxActive个jedis实例，则此时pool的状态为exhausted(耗尽)。
+# \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05B5\u03AA-1\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u01A3\uFFFD\uFFFD\uFFFD\uFFFDpool\uFFFD\u047E\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFDmaxActive\uFFFD\uFFFDjedis\u02B5\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02B1pool\uFFFD\uFFFD\u05F4\u032C\u03AAexhausted(\uFFFD\u013E\uFFFD)\uFFFD\uFFFD
 spring.redis.jedis.pool.max-active=8
-# 等待可用连接的最大时间，单位毫秒，默认值为-1，表示永不超时。如果超过等待时间，则直接抛出JedisConnectionException
+# \uFFFD\u0234\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04F5\uFFFD\uFFFD\uFFFD\uFFFD\u02B1\uFFFD\u48EC\uFFFD\uFFFD\u03BB\uFFFD\uFFFD\uFFFD\uB8EC\u012C\uFFFD\uFFFD\u05B5\u03AA-1\uFFFD\uFFFD\uFFFD\uFFFD\u02BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02B1\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0234\uFFFD\u02B1\uFFFD\u48EC\uFFFD\uFFFD\u05B1\uFFFD\uFFFD\uFFFD\u05F3\uFFFDJedisConnectionException
 spring.redis.jedis.pool.max-wait=-1ms
 
 
@@ -51,15 +51,22 @@ logging.path=E:/javaProject/cms_bin_scene_log
 logging.config=classpath:logback-spring.xml
 logging.level.com.gis=debug
 
-# 本地保存路径
+# \uFFFD\uFFFD\uFFFD\u0631\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
 file.path=F:\\test\\ngin\\bin_scene\\
 #server.domain =http://192.168.0.135/
 server.domain =http://www.4dmodel.com/
 
-# 七牛 oss info
+# \uFFFD\uFFFD\u0163 oss info
 oss.file.path=data/
 oss.domain=https://super.4dage.com/
 
+# swagger2 \uFFFD\uFFFD\uFFFD\uFFFD\u022B\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02BD\u03AAutf-8
+swagger.package=com.gis
+swagger.title=${project.sc}-dev
+swagger.description=${swagger.title}
+swagger.version=1.0
+
+
 #swagger login
 #knife4j.basic.enable=true
 #knife4j.basic.username=owen

gis_application/src/main/resources/application-pro.properties

@@ -6,21 +6,21 @@ spring.datasource.druid.username=root
 spring.datasource.druid.password=4dkankan4dage
 
 
-# 初始连接数
+# \uFFFD\uFFFD\u02BC\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 spring.datasource.druid.initial-size=5
-# 最小连接池数量
+# \uFFFD\uFFFD\u0421\uFFFD\uFFFD\uFFFD\u04F3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 spring.datasource.druid.min-idle=10
-# 最大连接池数量
+# \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04F3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 spring.datasource.druid.max-active=20
-# 配置获取连接等待超时的时间
+# \uFFFD\uFFFD\uFFFD\u00FB\uFFFD\u0221\uFFFD\uFFFD\uFFFD\u04F5\u0234\uFFFD\uFFFD\uFFFD\u02B1\uFFFD\uFFFD\u02B1\uFFFD\uFFFD
 spring.datasource.druid.max-wait=60000
-# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+# \uFFFD\uFFFD\uFFFD\u00FC\uFFFD\uFFFD\uFFFD\uFFFD\u00F2\u017D\uFFFD\uFFFD\uFFFD\u04BB\uFFFD\u03BC\uFFFD\u28EC\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04AA\uFFFD\u0631\u0575\u013F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04E3\uFFFD\uFFFD\uFFFD\u03BB\uFFFD\u01FA\uFFFD\uFFFD\uFFFD
 spring.datasource.druid.time-between-eviction-runs-millis=60000
-# 配置一个连接在池中最小生存的时间，单位是毫秒
+# \uFFFD\uFFFD\uFFFD\uFFFD\u04BB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u06B3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0421\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02B1\uFFFD\u48EC\uFFFD\uFFFD\u03BB\uFFFD\u01FA\uFFFD\uFFFD\uFFFD
 spring.datasource.druid.min-evictable-idle-time-millis=30000
-# 配置一个连接在池中最大生存的时间，单位是毫秒
+# \uFFFD\uFFFD\uFFFD\uFFFD\u04BB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u06B3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02B1\uFFFD\u48EC\uFFFD\uFFFD\u03BB\uFFFD\u01FA\uFFFD\uFFFD\uFFFD
 spring.datasource.druid.max-evictable-idle-time-millis=90000
-# 配置检测连接是否有效
+# \uFFFD\uFFFD\uFFFD\u00FC\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u01F7\uFFFD\uFFFD\uFFFD\u0427
 spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
 spring.datasource.druid.test-while-idle=true
 spring.datasource.druid.test-on-borrow=false
@@ -29,20 +29,20 @@ spring.datasource.druid.web-stat-filter.enabled=true
 spring.datasource.druid.stat-view-servlet.enabled=true
 
 
-# Redis数据库索引（默认为0）
+# Redis\uFFFD\uFFFD\uFFFD\u077F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u012C\uFFFD\uFFFD\u03AA0\uFFFD\uFFFD
 spring.redis.database=0
 spring.redis.host=127.0.0.1
 spring.redis.port=6379
 spring.redis.password=4dage
-# 连接超时时间 单位 ms（毫秒）
+# \uFFFD\uFFFD\uFFFD\u04F3\uFFFD\u02B1\u02B1\uFFFD\uFFFD \uFFFD\uFFFD\u03BB ms\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uB8E9
 spring.redis.timeout=3000ms
-# 连接池中的最大空闲连接，默认值也是8。
+# \uFFFD\uFFFD\uFFFD\u04F3\uFFFD\uFFFD\u0435\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04E3\uFFFD\u012C\uFFFD\uFFFD\u05B5\u04B2\uFFFD\uFFFD8\uFFFD\uFFFD
 spring.redis.jedis.pool.max-idle=8
-#连接池中的最小空闲连接，默认值也是0。
+#\uFFFD\uFFFD\uFFFD\u04F3\uFFFD\uFFFD\u0435\uFFFD\uFFFD\uFFFD\u0421\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04E3\uFFFD\u012C\uFFFD\uFFFD\u05B5\u04B2\uFFFD\uFFFD0\uFFFD\uFFFD
 spring.redis.jedis.pool.min-idle=0
-# 如果赋值为-1，则表示不限制；如果pool已经分配了maxActive个jedis实例，则此时pool的状态为exhausted(耗尽)。
+# \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05B5\u03AA-1\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u01A3\uFFFD\uFFFD\uFFFD\uFFFDpool\uFFFD\u047E\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFDmaxActive\uFFFD\uFFFDjedis\u02B5\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02B1pool\uFFFD\uFFFD\u05F4\u032C\u03AAexhausted(\uFFFD\u013E\uFFFD)\uFFFD\uFFFD
 spring.redis.jedis.pool.max-active=8
-# 等待可用连接的最大时间，单位毫秒，默认值为-1，表示永不超时。如果超过等待时间，则直接抛出JedisConnectionException
+# \uFFFD\u0234\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u04F5\uFFFD\uFFFD\uFFFD\uFFFD\u02B1\uFFFD\u48EC\uFFFD\uFFFD\u03BB\uFFFD\uFFFD\uFFFD\uB8EC\u012C\uFFFD\uFFFD\u05B5\u03AA-1\uFFFD\uFFFD\uFFFD\uFFFD\u02BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02B1\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0234\uFFFD\u02B1\uFFFD\u48EC\uFFFD\uFFFD\u05B1\uFFFD\uFFFD\uFFFD\u05F3\uFFFDJedisConnectionException
 spring.redis.jedis.pool.max-wait=-1ms
 
 
@@ -51,22 +51,29 @@ logging.path=/root/log/big_scene_log
 logging.config=classpath:logback-spring.xml
 logging.level.com.gis=debug
 
-# 本地保存路径
+# \uFFFD\uFFFD\uFFFD\u0631\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
 file.path=/root/user/cms_bin_scene_data/
 #server.domain =http://47.107.252.54:8105/
 server.domain =http://www.4dmodel.com/
 
-#静态资源目录
+#\uFFFD\uFFFD\u032C\uFFFD\uFFFD\u0534\u013F\u00BC
 server.file.path=/root/data/big_scene_data
 
 spring.mvc.static-path-pattern=/**
-### 匹配路径， 注意file后面的/ ，windows:\\  , linxu:全路径, 不需要特别加斜杠
+### \u01A5\uFFFD\uFFFD\u00B7\uFFFD\uFFFD\uFFFD\uFFFD \u05E2\uFFFD\uFFFDfile\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD/ \uFFFD\uFFFDwindows:\\  , linxu:\u022B\u00B7\uFFFD\uFFFD, \uFFFD\uFFFD\uFFFD\uFFFD\u04AA\uFFFD\u0631\uFFFD\uFFFD\u0431\uFFFD\uFFFD
 spring.resources.static-locations=file:${server.file.path}
 
-# 七牛 oss info
+# \uFFFD\uFFFD\u0163 oss info
 oss.file.path=data/
 oss.domain=https://super.4dage.com/
 
+# swagger2 \uFFFD\uFFFD\uFFFD\uFFFD\u022B\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02BD\u03AAutf-8
+swagger.package=com.gis
+swagger.title=${project.sc}-pro
+swagger.description=${swagger.title}
+swagger.version=1.0
+
+
 #swagger login
 knife4j.basic.enable=true
 knife4j.basic.username=owen

gis_application/src/main/resources/application.properties

@@ -1,18 +1,18 @@
 server.port=8105
 
-spring.profiles.active=dev
+spring.profiles.active=pro
 
-# 访问静态资源设置
+# \uFFFD\uFFFD\uFFFD\u02BE\uFFFD\u032C\uFFFD\uFFFD\u0534\uFFFD\uFFFD\uFFFD\uFFFD
 spring.resources.static-locations=classpath:templates/,classpath:static/,classpath:web/
 
-#上传文件大小
+#\uFFFD\u03F4\uFFFD\uFFFD\u013C\uFFFD\uFFFD\uFFFD\u0421
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.max-file-size=1024MB
 spring.servlet.multipart.max-request-size=1024MB
 
 
 
-#配置自动识别字段转换
+#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0536\uFFFD\u02B6\uFFFD\uFFFD\uFFFD\u05B6\uFFFD\u05EA\uFFFD\uFFFD
 mybatis.configuration.mapUnderscoreToCamelCase=true
 mapper.identity=MYSQL
 mapper.mappers=tk.mybatis.mapper.common.Mapper
@@ -22,6 +22,9 @@ pagehelper.params=count=countSql
 pagehelper.reasonable=false
 pagehelper.support-methods-arguments=true
 
+project.en=big_scene
+project.sc=\u5927\u573A\u666F\u7BA1\u7406\u540E\u53F0
+
 
 
 

gis_common/src/main/java/com/gis/common/config/CommonInterceptor.java

@@ -26,9 +26,9 @@ public class CommonInterceptor implements HandlerInterceptor {
 
 
         // pro环境禁止访问api文档
-        if (active.equals("pro")) {
-            return !request.getRequestURI().contains("doc.html");
-        }
+//        if (active.equals("pro")) {
+//            return !request.getRequestURI().contains("doc.html");
+//        }
 
         return true;
     }

gis_common/src/main/java/com/gis/common/config/Swagger2.java

@@ -1,7 +1,9 @@
 package com.gis.common.config;
 
+import com.gis.common.constant.ConfigConstant;
 import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
 import com.google.common.collect.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -21,25 +23,30 @@ import java.util.List;
 
 /**
  * Created by owen on 2020/2/18
- *
+ * <p>
  * 集成Swagger有3步：
  * 1.pom.xml添加依赖
  * 2.添加Swagger2.class
  * 3.Application.class 加上注解@EnableSwagger2 表示开启Swagger
  * 4.http://localhost:8080/doc.html#/
- *
+ * <p>
  * 2.9.2 不需要字启动类配置注解
  */
 @Configuration
 @EnableSwagger2
 @EnableKnife4j
 public class Swagger2 {
+
+    @Autowired
+    ConfigConstant configConstant;
+
     @Bean
     public Docket createRestApi() {
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("com.gis.web.controller"))
+//                .apis(RequestHandlerSelectors.basePackage("com.gis.web.controller"))
+                .apis(RequestHandlerSelectors.basePackage(configConstant.swaggerPackage))
                 .paths(PathSelectors.any())
                 .build()
                 //添加登录认证,可以使用token
@@ -48,11 +55,18 @@ public class Swagger2 {
                 ;
     }
 
+    //    private ApiInfo apiInfo() {
+//        return new ApiInfoBuilder()
+//                .title("大场景cms APIs")
+//                .description("大场景cms Api接口文档")
+//                .version("1.0")
+//                .build();
+//    }
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
-                .title("大场景cms APIs")
-                .description("大场景cms Api接口文档")
-                .version("1.0")
+                .title(configConstant.swaggerTitle)
+                .description(configConstant.swaggerDescription)
+                .version(configConstant.swaggerVersion)
                 .build();
     }
 

gis_common/src/main/java/com/gis/common/constant/ConfigConstant.java

@@ -0,0 +1,71 @@
+package com.gis.common.constant;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * Created by owen on 2020/12/31 0031 14:22
+ *
+ * 全局动态参数
+ */
+@Component
+public class ConfigConstant {
+
+//    /** 服务器文件地址*/
+//    @Value("${server.file.path}")
+//    public  String serverBasePath;
+
+//    @Value("${server.file.allow}")
+//    public String serverFileFallow;
+
+    /**redis token前缀*/
+//    @Value("${redis.prefix}")
+//    public  String redisPrefix;
+
+//    /**允许上传的文件后缀*/
+//    @Value("${file.allow}")
+//    public String fileAllow;
+
+//    @Value("${project.en}")
+//    public String projectEn;
+
+//    @Value("${project.name}")
+//    public String serverDomain;
+
+//    @Value("${oss.point}")
+//    public  String ossPoint;
+//
+//    @Value("${oss.key}")
+//    public  String ossKey;
+//
+//    @Value("${oss.secrecy}")
+//    public  String ossSecrecy;
+//
+//    @Value("${oss.bucket}")
+//    public  String ossBucket;
+//
+//    @Value("${oss.file.path}")
+//    public  String ossBasePath;
+//
+//    @Value("${oss.domain}")
+//    public  String ossDomain;
+
+
+    @Value("${swagger.package}")
+    public  String swaggerPackage;
+
+    @Value("${swagger.title}")
+    public  String swaggerTitle;
+
+    @Value("${swagger.description}")
+    public  String swaggerDescription;
+
+    @Value("${swagger.version}")
+    public  String swaggerVersion;
+
+
+
+
+
+
+}