Merge remote-tracking branch 'origin/master'

nbjk-admin/src/main/java/com/miaxis/system/controller/system/SysLoginController.java

@@ -2,12 +2,14 @@ package com.miaxis.system.controller.system;
 
 import com.alibaba.fastjson.JSONObject;
 import com.miaxis.apple.service.IAppleService;
-import com.miaxis.common.core.domain.DyUserInfoResult;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.WxUserInfo;
 import com.miaxis.common.core.domain.entity.SysMenu;
 import com.miaxis.common.core.domain.entity.SysUser;
-import com.miaxis.common.core.domain.model.*;
+import com.miaxis.common.core.domain.model.LoginBody;
+import com.miaxis.common.core.domain.model.LoginBodyNoCode;
+import com.miaxis.common.core.domain.model.LoginUser;
+import com.miaxis.common.core.domain.model.WxResult;
 import com.miaxis.common.enums.StudentLoginTypeEnum;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.SecurityUtils;
@@ -20,11 +22,6 @@ import com.miaxis.system.dto.system.AppleTokenDTO;
 import com.miaxis.system.dto.system.TokenDTO;
 import com.miaxis.system.dto.system.UserInfoDTO;
 import com.miaxis.system.service.ISysMenuService;
-import com.miaxis.feign.dto.DyTokenDTO;
-import com.miaxis.feign.dto.DyUserInfoDTO;
-import com.miaxis.feign.dto.ToutiaoTokenDTO;
-import com.miaxis.feign.service.DyService;
-import com.miaxis.feign.service.ToutiaoService;
 import com.miaxis.user.service.IUserInfoService;
 import com.miaxis.wx.service.WxService;
 import io.swagger.annotations.Api;
@@ -34,8 +31,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -74,12 +69,6 @@ public class SysLoginController
     private WxService wxService;
 
 
-    @Autowired
-    private DyService dyService;
-
-    @Autowired
-    private ToutiaoService toutiaoService;
-
     @Autowired
     private IUserInfoService userInfoService;
 
@@ -92,7 +81,6 @@ public class SysLoginController
     @Value("${gzh.appSecret}")
     private String gzhAppSecret;
 
-
     @Value("${app.appId}")
     private String appid;
 

nbjk-admin/src/test/java/com/miaxis/test/NormalTest.java

@@ -2,7 +2,6 @@ package com.miaxis.test;
 
 import com.miaxis.NbjkApplication;
 import com.miaxis.score.service.IScoreInfoService;
-import com.miaxis.feign.service.DyService;
 import com.miaxis.wx.service.IWxGzhService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -20,9 +19,6 @@ public class NormalTest {
     private IScoreInfoService iScoreInfoService;
 
 
-    @Autowired
-    private DyService dyService;
-
     @Autowired
     private IWxGzhService wxGzhService;
 

nbjk-framework/src/main/java/com/miaxis/framework/config/SwaggerConfig.java

@@ -110,9 +110,9 @@ public class SwaggerConfig
         // 用ApiInfoBuilder进行定制
         return new ApiInfoBuilder()
                 // 设置标题
-                .title("标题：速达驾考_接口文档")
+                .title("标题：财仝驾考_接口文档")
                 // 描述
-                .description("描述：仅用于miaxis 公司接口开发")
+                .description("描述：仅用于财仝驾考接口开发")
                 // 作者信息
                 .contact(new Contact(miaxisConfig.getName(), null, null))
                 // 版本

nbjk-service/src/main/java/com/miaxis/email/service/impl/EmailServiceImpl.java

@@ -29,7 +29,7 @@ public class EmailServiceImpl implements IEmailService {
         helper.setFrom("miaxis2022@163.com");
         helper.setTo(emailAddDTO.getAddress());
         //helper.setBcc("密送人");
-        helper.setSubject("【速达驾考】资料下载");
+        helper.setSubject("【财仝驾考】资料下载");
         helper.setSentDate(new Date());//发送时间
         helper.setText(getHtmlText(sysDictData),true);
         //第一个参数要发送的内容，第二个参数是不是Html格式。
@@ -42,7 +42,7 @@ public class EmailServiceImpl implements IEmailService {
                 "        height: 100vh;\">\n" +
                 "            <div class=\"head1\" style=\"width: 100%;\n" +
                 "            text-align: center;\n" +
-                "            font-weight: 550;\">感谢您使用速达驾考</div>\n" +
+                "            font-weight: 550;\">感谢您使用财仝驾考</div>\n" +
                 "            <div class=\"head2\" style=\"width: 100%;\n" +
                 "            text-align: center;\n" +
                 "            margin-top: 15px;\">请点击下方按钮下载【"+sysDictData.getDictLabel()+"】课程资料</div>\n" +

nbjk-service/src/main/java/com/miaxis/feign/service/DyService.java

@@ -1,48 +0,0 @@
-package com.miaxis.feign.service;
-
-
-import com.miaxis.common.config.FeignConfig;
-import com.miaxis.feign.dto.DyUserInfoDTO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Component;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- *
- * 抖音
- */
-@FeignClient(name="dyService",
-        url = "https://open.douyin.com",configuration = FeignConfig.class)
-@Component
-public interface DyService {
-    /**
-     *  获取openid
-     * @return
-     */
-    @PostMapping(value = "/oauth/access_token/",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
-    String getDyToken(@RequestBody MultiValueMap dyTokenDTO);
-
-
-    @PostMapping(value = "/oauth/access_token/",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
-    String getDyToken1(@RequestParam("client_secret") String  client_secret,@RequestParam("code") String  code
-                       ,@RequestParam("grant_type") String  grant_type,@RequestParam("client_key") String  client_key);
-
-
-
-
-
-    /**
-     * 获取用户信息
-     */
-    @PostMapping(value = "/oauth/userinfo/",consumes = MediaType.APPLICATION_JSON_VALUE)
-//    @PostMapping(value = "/oauth/userinfo/")
-    String getUserInfo(
-            @RequestBody DyUserInfoDTO dyUserInfoDTO
-    );
-
-
-}

nbjk-service/src/main/java/com/miaxis/feign/service/ToutiaoService.java

@@ -1,45 +0,0 @@
-package com.miaxis.feign.service;
-
-
-import com.miaxis.common.config.FeignConfig;
-import com.miaxis.feign.dto.ToutiaoCreatOrderDTO;
-import com.miaxis.feign.dto.ToutiaoTokenDTO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- *
- * 头条
- */
-@FeignClient(name="ttService",
-        url = "https://developer.toutiao.com",configuration = FeignConfig.class)
-@Component
-public interface ToutiaoService {
-    /**
-     *  获取openid
-     * @return
-     */
-    @PostMapping(value = "/api/apps/v2/jscode2session")
-    String getTtUserInfo(@RequestBody ToutiaoTokenDTO toutiaoTokenDTO);
-
-    /**
-     *  预下单
-     * @return
-     */
-    @PostMapping(value = "/api/apps/ecpay/v1/create_order")
-    String createOrder(@RequestBody ToutiaoCreatOrderDTO toutiaoCreatOrderDTO);
-
-
-
-//    /**
-//     * 获取用户信息
-//     */
-//    @PostMapping(value = "/oauth/userinfo")
-//    String getUserInfo(
-//            @RequestBody DyUserInfoDTO dyUserInfoDTO
-//    );
-
-
-}

nbjk-service/src/main/java/com/miaxis/wx/service/impl/WxGzhServiceImpl.java

@@ -192,7 +192,7 @@ public class WxGzhServiceImpl implements IWxGzhService {
                         result =  MessageUtil.initText(fromUserName,toUserName," ");
 
                     }else {
-                        result =  MessageUtil.initText(fromUserName, toUserName, "欢迎关注速达财仝，您的学车好伙伴！");
+                        result =  MessageUtil.initText(fromUserName, toUserName, "欢迎关注财仝驾考，您的学车好伙伴！");
                     }
 
 

nbjk-service/src/main/java/com/miaxis/wx/service/impl/WxOrderServiceImpl.java

@@ -82,7 +82,7 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
         //兼容线上版本
         if (sysDictData == null){
             price = configService.selectConfigByKey("vip_price");
-            wxOrder.setGoodsName("速达驾考超级vip");
+            wxOrder.setGoodsName("财仝驾考超级vip");
             //成为高级vip
             wxOrder.setOrderDataJson("1");
         }else if ("nbjk_vip".equals(sysDictData.getDictLabel())){