Переглянути джерело

排除application-dev.yml

zhengqiang 5 роки тому
батько
коміт
fe61e5f753

+ 2 - 0
web/src/main/java/com/jpsoft/smart/config/WebMvcConfig.java

@@ -28,6 +28,8 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
 	@Override
 	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+		registry.addResourceHandler("/**").addResourceLocations("classpath:/static/");
+
 		registry.addResourceHandler("swagger-ui.html")
 				.addResourceLocations("classpath:/META-INF/resources/");
 

+ 8 - 3
web/src/main/java/com/jpsoft/smart/modules/mobile/controller/PersonInfoApiController.java

@@ -262,6 +262,13 @@ public class PersonInfoApiController {
                 throw new Exception("人员信息不存在!");
             }
 
+            //todo 更新人脸照片
+            personInfo.setOpenId(openId);
+            personInfo.setFaceImageUrl(faceImageUrl);
+            personInfo.setUpdateTime(new Date());
+
+            personInfoService.update(personInfo);
+
             //todo 同步终端
             List<LapiMsgResult> msgResultList = lapiService.addPerson(personId);
 
@@ -289,10 +296,8 @@ public class PersonInfoApiController {
                 success &= lapiMsgResult.isSuccess();
             }
 
-            personInfo.setOpenId(openId);
-            personInfo.setFaceImageUrl(faceImageUrl);
+            //todo 再次更新绑定状态
             personInfo.setFaceBound(success);
-
             personInfo.setUpdateTime(new Date());
 
             personInfoService.update(personInfo);

+ 4 - 2
web/src/main/resources/application-production.yml

@@ -35,8 +35,10 @@ springfox:
 
 wx:
   pay:
-    appId: wx7e70eb62a8459869
-    appSecret: 909d17e353268da57c4f18cc09798049
+#    appId: wx7e70eb62a8459869
+#    appSecret: 909d17e353268da57c4f18cc09798049
+    appId: wx0b3c41a903053808
+    appSecret: 43557bd62f77b0c3d6670e991872f0e7
     mchId: 1500160622
     subMchId: 1505070291
     mchKey: jpsoft11111111111111111111111111

+ 1 - 1
web/src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
     context-path: /smart-community-server
 
 spring:
-  http:
+  servlet:
     multipart:
       max-request-size: 20MB
       max-file-size: 20MB