将数据库、redis配置去掉

更新注释

README.md

@@ -2,5 +2,10 @@
 AI一键换装-东方一贤-北京
 
     2021-07-20-pro, 不需要数据库, 已部署生产环境， 待测试
+    doc:https://wohezuxian.com/doc.html
     service:82.157.19.18:8007/doc.html
-    jar: /root/java/wx_reload_beijing_8007
+    jar: /root/java/wx_reload_beijing_8007
+    
+    
+## sit
+    doc: http://project.4dage.com:8007/doc.html 

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

@@ -1,52 +1,7 @@
 
-#DB
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.druid.url=jdbc:mysql://localhost:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-#spring.datasource.druid.password=root
-spring.datasource.druid.username=root
-spring.datasource.druid.url=jdbc:mysql://8.135.106.227:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.druid.password=4dkk2021testproject%
-
-
-# \u521D\u59CB\u8FDE\u63A5\u6570
-spring.datasource.druid.initial-size=5
-# \u6700\u5C0F\u8FDE\u63A5\u6C60\u6570\u91CF
-spring.datasource.druid.min-idle=10
-# \u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
-spring.datasource.druid.max-active=20
-# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
-spring.datasource.druid.max-wait=60000
-# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.time-between-eviction-runs-millis=60000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.min-evictable-idle-time-millis=30000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5927\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.max-evictable-idle-time-millis=90000
-# \u914D\u7F6E\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548
-spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
-spring.datasource.druid.test-while-idle=true
-spring.datasource.druid.test-on-borrow=false
-spring.datasource.druid.test-on-return=false
-spring.datasource.druid.web-stat-filter.enabled=true
-spring.datasource.druid.stat-view-servlet.enabled=true
-
-
-# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-spring.redis.database=0
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=
-# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4 \u5355\u4F4D ms\uFF08\u6BEB\u79D2\uFF09
-spring.redis.timeout=3000ms
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F8\u3002
-spring.redis.jedis.pool.max-idle=8
-#\u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F0\u3002
-spring.redis.jedis.pool.min-idle=0
-# \u5982\u679C\u8D4B\u503C\u4E3A-1\uFF0C\u5219\u8868\u793A\u4E0D\u9650\u5236\uFF1B\u5982\u679Cpool\u5DF2\u7ECF\u5206\u914D\u4E86maxActive\u4E2Ajedis\u5B9E\u4F8B\uFF0C\u5219\u6B64\u65F6pool\u7684\u72B6\u6001\u4E3Aexhausted(\u8017\u5C3D)\u3002
-spring.redis.jedis.pool.max-active=8
-# \u7B49\u5F85\u53EF\u7528\u8FDE\u63A5\u7684\u6700\u5927\u65F6\u95F4\uFF0C\u5355\u4F4D\u6BEB\u79D2\uFF0C\u9ED8\u8BA4\u503C\u4E3A-1\uFF0C\u8868\u793A\u6C38\u4E0D\u8D85\u65F6\u3002\u5982\u679C\u8D85\u8FC7\u7B49\u5F85\u65F6\u95F4\uFF0C\u5219\u76F4\u63A5\u629B\u51FAJedisConnectionException
-spring.redis.jedis.pool.max-wait=-1ms
+
+
+
 
 #oss
 oss.point=http://oss-cn-shenzhen.aliyuncs.com

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

@@ -1,55 +1,7 @@
 
-#DB
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.druid.url=jdbc:mysql://localhost:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-#spring.datasource.druid.username=root
-#spring.datasource.druid.password=4dkk2020test%
-
-#spring.datasource.druid.url=jdbc:mysql://8.135.106.227:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.druid.url=jdbc:mysql://127.0.0.1:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.druid.username=root
-spring.datasource.druid.password=4dkk2021testproject%
-
-
-# \u521D\u59CB\u8FDE\u63A5\u6570
-spring.datasource.druid.initial-size=5
-# \u6700\u5C0F\u8FDE\u63A5\u6C60\u6570\u91CF
-spring.datasource.druid.min-idle=10
-# \u6700\u5927\u8FDE\u63A5\u6C60\u6570\u91CF
-spring.datasource.druid.max-active=20
-# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
-spring.datasource.druid.max-wait=60000
-# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.time-between-eviction-runs-millis=60000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.min-evictable-idle-time-millis=30000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5927\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.max-evictable-idle-time-millis=90000
-# \u914D\u7F6E\u68C0\u6D4B\u8FDE\u63A5\u662F\u5426\u6709\u6548
-spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
-spring.datasource.druid.test-while-idle=true
-spring.datasource.druid.test-on-borrow=false
-spring.datasource.druid.test-on-return=false
-spring.datasource.druid.web-stat-filter.enabled=true
-spring.datasource.druid.stat-view-servlet.enabled=true
-
-
-# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-spring.redis.database=0
-spring.redis.host=127.0.0.1
-spring.redis.port=6379
-spring.redis.password=
-# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4 \u5355\u4F4D ms\uFF08\u6BEB\u79D2\uFF09
-spring.redis.timeout=3000ms
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F8\u3002
-spring.redis.jedis.pool.max-idle=8
-#\u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u9ED8\u8BA4\u503C\u4E5F\u662F0\u3002
-spring.redis.jedis.pool.min-idle=0
-# \u5982\u679C\u8D4B\u503C\u4E3A-1\uFF0C\u5219\u8868\u793A\u4E0D\u9650\u5236\uFF1B\u5982\u679Cpool\u5DF2\u7ECF\u5206\u914D\u4E86maxActive\u4E2Ajedis\u5B9E\u4F8B\uFF0C\u5219\u6B64\u65F6pool\u7684\u72B6\u6001\u4E3Aexhausted(\u8017\u5C3D)\u3002
-spring.redis.jedis.pool.max-active=8
-# \u7B49\u5F85\u53EF\u7528\u8FDE\u63A5\u7684\u6700\u5927\u65F6\u95F4\uFF0C\u5355\u4F4D\u6BEB\u79D2\uFF0C\u9ED8\u8BA4\u503C\u4E3A-1\uFF0C\u8868\u793A\u6C38\u4E0D\u8D85\u65F6\u3002\u5982\u679C\u8D85\u8FC7\u7B49\u5F85\u65F6\u95F4\uFF0C\u5219\u76F4\u63A5\u629B\u51FAJedisConnectionException
-spring.redis.jedis.pool.max-wait=-1ms
+
+
+
 
 
 #log

gis_application/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 server.port=8007
 
-spring.profiles.active=pro
+spring.profiles.active=sit
 
 # \u9879\u76EE\u540D\u79F0
 project.name=wx_reload_beijing

gis_web/src/main/java/com/gis/web/controller/UploadController.java

@@ -31,7 +31,7 @@ public class UploadController {
     UploadService uploadService;
 
 
-    @ApiOperation(value = "上传换装图片", notes = "type:类型,caocao、zhugeliang")
+    @ApiOperation(value = "上传换装图片", notes = "type:类型,caocao、zhugeliang, 图片需要真实人脸,否则算法会抛异常")
     @PostMapping("uploadFaceSwap/{type}")
     public Result uploadReload(MultipartFile file, @PathVariable String type){
         return uploadService.uploadFaceSwap(file, type);