添加谷芽主体信息

src/main/java/com/rf/psychological/security/SSLConfig.java

@@ -16,7 +16,7 @@ import org.springframework.context.annotation.Profile;
  * @description:
  * @date 2021/9/15 14:32
  */
-//@Configuration
+@Configuration
 @Profile({"public"})
 public class SSLConfig {
 
@@ -54,7 +54,7 @@ public class SSLConfig {
             connector.setRedirectPort(8848);
         } else if ("public".equals(profile)) {
             //101心理照相机公网版正式
-            connector.setPort(8084);
+            connector.setPort(8085);
             connector.setRedirectPort(8445);
         } else {
             //TODO 待定

src/main/java/com/rf/psychological/user/rest/SystemController.java

@@ -120,7 +120,7 @@ public class SystemController extends BaseController {
            userEntity.setBirthday("-");
            userEntity.setGender("-");
            userEntity.setPetName("游离用户");
-           userEntity.setProfession("-");
+           userEntity.setProfession(DateUtil.now());
            userEntity.setAdditionInfo("游离用户");
            userEntity.setPhone(SnowFlakeUtil.getNextId());
            userEntity.setRoleType(UserRole.COMMON.getType());
@@ -613,20 +613,19 @@ public class SystemController extends BaseController {
         return "hello";
     }
 
-    @GetMapping("/addItem")
-    public  void addItem(String fileName,String flag){
-        File file = new File("C:\\Users\\Administrator\\Desktop\\推广量表\\"+fileName+".xlsx");
+    @GetMapping("/updateContent")
+    public  void addItem(String flag){
         try {
-            List<List<List<Object>>> datas = ExcelUtil.getBankListByExcelSheet(new FileInputStream(file.getAbsolutePath()), file.getName());
             List<ScaleEntity> scaleEntities = scaleService.getScaleByFlag(flag);
-            List<List<Object>> an = datas.get(5);
-            for (int i=5;i<scaleEntities.size();i++){
+            for (int i= 0;i<scaleEntities.size();i++){
                 ScaleEntity entity = scaleEntities.get(i);
-                entity.setCheckItems(an.get(i-5).get(2).toString());
-                log.info(entity.toString());
-                //scaleService.saveScale(entity);
+                String content = entity.getAnswer();
+                if (content.contains("。")){
+                    log.info(content);
 
 
+                    log.info(entity.toString());
+                }
             }
         }catch (Exception e){
             e.printStackTrace();
@@ -741,14 +740,14 @@ public class SystemController extends BaseController {
         try {
             List<List<List<Object>>> datas = ExcelUtil.getBankListByExcelSheet(new FileInputStream(file.getAbsolutePath()), file.getName());
             List<ScaleMarksEntity> scaleMarksEntities = scaleMarksService.getScaleMarksByFlag(flag);
-            List<List<Object>> markObj = datas.get(2);
+            List<List<Object>> markObj = datas.get(5);
             for (int i =0;i<markObj.size();i++){
                 List<Object> objects = markObj.get(i);
                 ScaleMarksEntity entity = new ScaleMarksEntity();
                 entity.setName(objects.get(0).toString());
                 entity.setScoreStart(objects.get(1).toString());
                 entity.setScoreEnd(objects.get(2).toString());
-                entity.setSymptom("无");
+                entity.setSymptom(objects.get(3).toString());
                 entity.setImprovementSuggestions(objects.get(4).toString());
                 entity.setFlag(flag);
                 entity.setReference("无");
@@ -756,7 +755,7 @@ public class SystemController extends BaseController {
                 entity.setNameExplain("无");
                 entity.setSuggestion("无");
                 entity.setIsTotalScoreExplain("否");
-                entity.setScoringType("2");
+                entity.setScoringType("0");
                 log.info(entity.toString());
                 //scaleMarksService.saveScaleMarks(entity);
             }

src/main/resources/config/application-public.yml

@@ -3,9 +3,14 @@ server:
   port: 8445
   address: 0.0.0.0
 
+  ssl:
+    key-store: classpath:hnhong-duo.com.jks
+    key-store-password: pk4x5v3pz83va2
+    key-store-type: JKS
+
 #  ssl:
-#    key-store: classpath:hnhong-duo.com.jks
-#    key-store-password: pk4x5v3pz83va2
+#    key-store: classpath:guya-tech.com.jks
+#    key-store-password: 120jtiv035z7
 #    key-store-type: JKS
 
 
@@ -41,21 +46,24 @@ wx.pay:
   #HD
   # 商户号
   mch-id: 1655519363
-  #mch-id: 1680226340
   #商户api证书序列号
   mch-serial-no: 692670931729B82A48747B47EFE3142BCA73D978
-  #mch-serial-no: 2D81528EEFB70503C10339D9655408E0A583C963
   # 商户私钥文件
   private-key-path: apiclient_key_hd.pem
-  #private-key-path: apiclient_key_gy.pem
   # API秘钥
   api-v3-key: MentalHealth20191025HongduoTest1
-  #api-v3-key: MentalHealth20240624HuYaTest0628
-  # APPID
-  app-id: wx43ca40dd2be85dd6
   # 接受结果回调地址
-  notify-domain: https://hnhong-duo.com
+  notify-domain: https://hnhong-duo.com/
+
+  #GY
+#  mch-id: 1680226340
+#  mch-serial-no: 2D81528EEFB70503C10339D9655408E0A583C963
+#  private-key-path: apiclient_key_gy.pem
+#  notify-domain: https://guya-tech.com
 
+
+  # APPID
+  app-id: wx43ca40dd2be85dd6
   # 微信服务器地址
   domain: https://api.mch.weixin.qq.com
   is_lan: false