add

fs-admin/src/main/resources/application.yml

@@ -6,5 +6,5 @@ spring:
   profiles:
 #    active: dev
 #    include: common,config-dev
-    active: druid-jzzx
-    include: common,config-druid-jzzx
+    active: druid-hcl
+    include: common,config-druid-hcl

fs-company/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: dev
-    include: common,config-dev
-#    active: druid-jz
-#    include: common,config-druid-jz
+#    active: dev
+#    include: common,config-dev
+    active: druid-jzzx
+    include: common,config-druid-jzzx

fs-qw-task/src/main/resources/application.yml

@@ -6,5 +6,7 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: dev
-    include: common,config-dev
+#    active: dev
+#    include: common,config-dev
+    active: druid-hcl
+    include: common,config-druid-hcl

fs-service/src/main/java/com/fs/his/service/impl/FsStorePaymentServiceImpl.java

@@ -464,7 +464,9 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
         } else {
             result= sendRedPacketLegacyInternal(param, config);
         }
+        result.put("mchId",config.getMchId()+"");
         result.put("isNew",config.getIsNew());
+        System.out.println("红包返回："+result);
         return result;
     }
 

fs-service/src/main/resources/application-common.yml

@@ -14,6 +14,12 @@ fs:
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
+  jwt:
+    # 加密秘钥
+    secret: f4e2e52034348f86b67cde581c0f9eb5
+    # token有效时长，7天，单位秒
+    expire: 31536000
+    header: AppToken
 # 开发环境配置
 server:
   servlet:

fs-service/src/main/resources/application-config-druid-hcl.yml

@@ -29,16 +29,16 @@ wx:
       port: 6379
       timeout: 2000
     configs:
-      - appId: wx894a6220c608f5c1 # 第一个公众号的appid  //公众号名称:弘珍医药
-        secret: dabd5168d58c66e97be1ab1eee346b20 # 公众号的appsecret
+      - appId: wx2f17bb412271cfe6 # 第一个公众号的appid  //公众号名称:木易华康在线
+        secret: 47b6d65c45719e3e40392e19996587b3 # 公众号的appsecret
         token: PPKOdAlCoMO # 接口配置里的Token值
         aesKey: Eswa6VjwtVMCcw03qZy6fWllgrv5aytIA1SZPEU0kU2 # 接口配置里的EncodingAESKey值
 aifabu:  #爱链接
   appKey: 7b471be905ab17e00f3b858c6710dd117601d008
 watch:
   watchUrl: watch.ylrzcloud.com/prod-api
-#  account: tcloud
-#  password: mdf-m2h_6yw2$hq
+  #  account: tcloud
+  #  password: mdf-m2h_6yw2$hq
   account1: ccif #866655060138751
   password1: cp-t5or_6xw7$mt
   account2: tcloud #rt500台
@@ -57,10 +57,10 @@ nuonuo:
 tencent_cloud_config:
   secret_id: AKIDiMq9lDf2EOM9lIfqqfKo7FNgM5meD0sT
   secret_key: u5SuS80342xzx8FRBukza9lVNHKNMSaB
-  bucket: hzyy-1323137866
+  bucket: hcl-1323137866
   app_id: 1323137866
   region: ap-chongqing
-  proxy: hzyy
+  proxy: hcl
 tmp_secret_config:
   secret_id: AKIDCj7NSNAovtqeJpBau8GZ4CGB71thXIxX
   secret_key: lTB5zwqqz7CNhzDOWivFWedgfTBgxgBT
@@ -69,6 +69,8 @@ tmp_secret_config:
   region: ap-chongqing
   proxy: fs
 cloud_host:
-  company_name: 弘珍医药
+  company_name: 恒春来
+headerImg:
+  imgUrl: https://jz-cos-1356808054.cos.ap-chengdu.myqcloud.com/fs/20250515/0877754b59814ea8a428fa3697b20e68.png
 
 

fs-service/src/main/resources/application-config-druid-hzyy.yml

@@ -70,5 +70,7 @@ tmp_secret_config:
   proxy: fs
 cloud_host:
   company_name: 弘珍医药
+headerImg:
+  imgUrl: https://jz-cos-1356808054.cos.ap-chengdu.myqcloud.com/fs/20250515/0877754b59814ea8a428fa3697b20e68.png
 
 

fs-service/src/main/resources/application-config-druid-jzzx.yml

@@ -70,5 +70,6 @@ tmp_secret_config:
   proxy: fs
 cloud_host:
   company_name: 九州在线
-
+headerImg:
+  imgUrl: https://jiuzhouzaixian.obs.cn-southwest-2.myhuaweicloud.com/fs/20250516/1747361877816.png
 

fs-user-app/src/main/java/com/fs/app/controller/WxMpController.java

@@ -194,6 +194,7 @@ public class WxMpController {
         user.setCreateTime(new Date());
         userService.insertFsUser(user);
       }
+      System.out.println("user:id:"+user.getUserId());
       String token = jwtUtils.generateToken(user.getUserId());
       redisCache.setCacheObject("token:"+user.getUserId(),token,604800, TimeUnit.SECONDS);
       Map<String,Object> map=new HashMap<>();

fs-user-app/src/main/resources/application.yml

@@ -8,5 +8,5 @@ spring:
   profiles:
 #    active: dev
 #    include: common,config-dev
-    active: druid-jz
-    include: common,config-druid-jz
+    active: druid-jzzx
+    include: common,config-druid-jzzx