Merge branch 'master' of ssh://192.168.8.213:10022/miaxis/hzgzpt

# Conflicts:
#	hzgzpt-admin/src/main/java/com/miaxis/app/controller/user/UserInfoController.java

hzgzpt-admin/src/main/java/com/miaxis/app/controller/coach/CoachEvaluateController.java

@@ -4,6 +4,7 @@ import com.miaxis.app.coach.domain.CoachEvaluateLabel;
 import com.miaxis.app.coach.dto.CoachEvaluateDto;
 import com.miaxis.app.coach.service.ICoachEvaluateService;
 import com.miaxis.common.annotation.Log;
+import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.enums.BusinessTypeEnum;
@@ -25,7 +26,7 @@ import java.util.List;
  * @date 2020-12-28
  */
 @RestController
-@RequestMapping("/system/evaluate")
+@RequestMapping(Constants.STUDENT_PREFIX+"/system/evaluate")
 @Api(tags={"【app-教练评价】"})
 public class CoachEvaluateController extends BaseController{
 

hzgzpt-admin/src/main/java/com/miaxis/app/controller/news/NewsInfoController.java

@@ -44,17 +44,6 @@ public class NewsInfoController extends BaseController{
         return toResponsePageInfo(list);
     }
 
-    /**
-     * 导出新闻(首页资讯、通知、公告相关)列表
-     */
-    @Log(title = "新闻(首页资讯、通知、公告相关)", businessType = BusinessTypeEnum.EXPORT)
-    @GetMapping("/export")
-    @ApiOperation("导出新闻(首页资讯、通知、公告相关)列表Excel")
-    public Response<String> export(@ModelAttribute NewsInfo newsInfo){
-        List<NewsInfo> list = newsInfoService.selectNewsInfoList(newsInfo);
-        ExcelUtil<NewsInfo> util = new ExcelUtil<NewsInfo>(NewsInfo.class);
-        return util.exportExcel(list, "info");
-    }
 
     /**
      * 获取新闻(首页资讯、通知、公告相关)详细信息
@@ -71,7 +60,6 @@ public class NewsInfoController extends BaseController{
     /**
      * 新增新闻(首页资讯、通知、公告相关)
      */
-    @Log(title = "新闻(首页资讯、通知、公告相关)", businessType = BusinessTypeEnum.INSERT)
     @PostMapping
     @ApiOperation("新增新闻(首页资讯、通知、公告相关)")
     public Response<Integer> add(@RequestBody NewsInfo newsInfo){
@@ -81,7 +69,6 @@ public class NewsInfoController extends BaseController{
     /**
      * 修改新闻(首页资讯、通知、公告相关)
      */
-    @Log(title = "新闻(首页资讯、通知、公告相关)", businessType = BusinessTypeEnum.UPDATE)
     @PutMapping
     @ApiOperation("修改新闻(首页资讯、通知、公告相关)")
     public Response<Integer> edit(@RequestBody NewsInfo newsInfo){
@@ -91,13 +78,11 @@ public class NewsInfoController extends BaseController{
     /**
      * 删除新闻(首页资讯、通知、公告相关)
      */
-    @Log(title = "新闻(首页资讯、通知、公告相关)", businessType = BusinessTypeEnum.DELETE)
 	@DeleteMapping("/{ids}")
     @ApiOperation("删除新闻(首页资讯、通知、公告相关)")
     public  Response<Integer> remove(
             @ApiParam(name = "ids", value = "新闻(首页资讯、通知、公告相关)ids参数", required = true)
-            @PathVariable Long[] ids
-    ){
+            @PathVariable Long[] ids){
         return toResponse(newsInfoService.deleteNewsInfoByIds(ids));
     }
 }

hzgzpt-admin/src/main/java/com/miaxis/app/controller/school/SchoolEvaluateController.java

@@ -24,7 +24,7 @@ import java.util.List;
  * @date 2020-12-28
  */
 @RestController
-@RequestMapping(Constants.OPEN_PREFIX+"/system/evaluate")
+@RequestMapping(Constants.STUDENT_PREFIX + "/system/evaluate")
 @Api(tags={"【app-驾校评价】"})
 public class SchoolEvaluateController extends BaseController{
 

hzgzpt-admin/src/main/java/com/miaxis/app/controller/user/UserInfoController.java

@@ -12,6 +12,8 @@ import com.miaxis.common.core.domain.Response;
 import com.miaxis.common.core.domain.entity.SysUser;
 import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.common.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.PictureType;
+import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.SecurityUtils;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,7 +71,7 @@ public class UserInfoController extends BaseController{
     /**
      * 根据电话获取用户信息详细信息
      */
-    @GetMapping(value = "/mobles/{mobile}")
+    @GetMapping(value = "mobles/{mobile}")
     @ApiOperation("获取用户信息详细信息")
     public Response<UserInfo> getInfo(
             @ApiParam(name = "mobile", value = "用户电话", required = true)
@@ -104,15 +106,25 @@ public class UserInfoController extends BaseController{
      * 上传身份证正反面,及人像图片
      * uploadIdCardAndHeadPicture
      */
-    @PostMapping("/uploadIdCardAndHeadPicture")
+    @PostMapping(Constants.OPEN_PREFIX + "/uploadIdCardAndHeadPicture")
     @ApiOperation("上传身份证正反面,及人像图片")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "type",value = "idCardFront:身份证正面、idCardReverse:身份证反面、faces:人像" ,dataType = "String",required = true),
-           // @ApiImplicitParam(name = "multFile", value = "上传文件", required = true, dataType = "MultipartFile")
+            @ApiImplicitParam(name = "type",value = "1:身份证正面 2:身份证反面 3:人脸比对模板(采集人像图)" ,dataType = "String",required = true),
+            @ApiImplicitParam(name = "multFile", value = "上传文件", required = true, dataType = "String")
     })
     public Response uploadIdCardAndHeadPicture(String type,MultipartFile multFile) throws IOException {
-        String savePath = AliyunConfig.gzpt_user + type + "/"
-                + new SimpleDateFormat("yyyyMMdd").format(new Date()) + "/";
+        String prefix = "";
+        if ("1".equals(type)){
+            prefix = PictureType.IDCARDFRONT.getPrefix();
+        }else if ("2".equals(type)){
+            prefix = PictureType.IDCARDREVERSE.getPrefix();
+        }else if ("3".equals(type)){
+            prefix = PictureType.FACES.getPrefix();
+        }else {
+            throw new CustomException("类型错误!");
+        }
+        String savePath = AliyunConfig.gzpt_user
+                + new SimpleDateFormat("yyyyMMdd").format(new Date()) + "/"+ prefix + "/";
         String fileName = System.currentTimeMillis() + ".jpg";//文件名
         String fileUrl = AliyunUpload.uploadForStream(multFile.getInputStream(), savePath, fileName);
         FileVo fileVo = new FileVo();
@@ -126,7 +138,7 @@ public class UserInfoController extends BaseController{
      * 删除文件
      * uploadIdCardAndHeadPicture
      */
-    @PostMapping("/deleteCardAndHeadPicture")
+    @PostMapping(Constants.OPEN_PREFIX + "/deleteCardAndHeadPicture")
     @ApiOperation("删除文件")
     @ApiImplicitParam(name = "filePath",value = "文件路径(filePath)" ,dataType = "String",required = true)
     public Response deleteCardAndHeadPicture(String filePath) {
@@ -139,7 +151,7 @@ public class UserInfoController extends BaseController{
      * 保存用户报名信息
      * uploadIdCardAndHeadPicture
      */
-    @PostMapping("/saveUserInformation")
+    @PostMapping(Constants.OPEN_PREFIX + "/saveUserInformation")
     @ApiOperation("保存用户报名信息")
     public Response saveUserInformation(UserDto userDto) {
 
@@ -150,7 +162,7 @@ public class UserInfoController extends BaseController{
      * 注册报名获取短信验证码
      * @return
      */
-    @ApiOperation("注册报名获取短信验证码")
+    @ApiOperation(Constants.OPEN_PREFIX + "注册报名获取短信验证码")
     @ApiImplicitParam(name = "phone",value = "手机号码" ,dataType = "String",required = true)
     @PostMapping(value = "/sendSignUpVerificationCode")
     public Response sendSignUpVerificationCode(String phone){

hzgzpt-common/src/main/java/com/miaxis/common/enums/PictureType.java

@@ -0,0 +1,41 @@
+package com.miaxis.common.enums;
+
+/**
+ * 用户报名上传图片类型
+ * @Author wwl
+ * @Date 2021/1/5
+ * @Version 1.0
+ */
+public enum PictureType {
+
+    IDCARDFRONT("1", "身份证正面","idCardFront"),
+    IDCARDREVERSE("2", "身份证反面","idCardReverse"),
+    FACES("3", "采集人像图","faces");
+
+    private final String code;
+    private final String info;
+    private final String prefix;
+
+    PictureType(String code, String info,String prefix)
+    {
+        this.code = code;
+        this.info = info;
+        this.prefix = prefix;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+
+    public String getPrefix()
+    {
+        return prefix;
+    }
+
+}

hzgzpt-framework/src/main/java/com/miaxis/framework/aspectj/DataSourceAspect.java

@@ -62,6 +62,7 @@ public class DataSourceAspect
     public DataSource getDataSource(ProceedingJoinPoint point)
     {
         MethodSignature signature = (MethodSignature) point.getSignature();
+        //查找第一个参数类中，是否涵盖DataSource注解。如果有，就返回此注解，没有就返回空
         DataSource dataSource = AnnotationUtils.findAnnotation(signature.getMethod(), DataSource.class);
         if (Objects.nonNull(dataSource))
         {

hzgzpt-framework/src/main/java/com/miaxis/framework/config/DruidConfig.java

@@ -30,6 +30,7 @@ import java.util.Map;
 public class DruidConfig
 {
     @Bean
+    //prefix属性，通过指定的前缀，绑定配置文件中的配置，该注解可以放在类上，也可以放在方法上
     @ConfigurationProperties("spring.datasource.druid.master")
     public DataSource masterDataSource(DruidProperties druidProperties)
     {
@@ -39,6 +40,7 @@ public class DruidConfig
 
     @Bean
     @ConfigurationProperties("spring.datasource.druid.slave")
+    //控制配置类是否生效 enabled为true时生效
     @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true")
     public DataSource slaveDataSource(DruidProperties druidProperties)
     {

hzgzpt-framework/src/main/java/com/miaxis/framework/datasource/DynamicDataSource.java

@@ -14,11 +14,19 @@ public class DynamicDataSource extends AbstractRoutingDataSource
 {
     public DynamicDataSource(DataSource defaultTargetDataSource, Map<Object, Object> targetDataSources)
     {
+        //设置默认数据源(主数据源)
         super.setDefaultTargetDataSource(defaultTargetDataSource);
+        //设置(从数据源-集合)
         super.setTargetDataSources(targetDataSources);
+        ////将数据源分别进行复制到 resolvedDataSources 和 resolvedDefaultDataSource中
         super.afterPropertiesSet();
     }
 
+    /**
+     * 返回需要使用的DataSource的key值，然后根据这个key从 resolvedDataSources
+     *  这个map里取出对应的 DataSource，如果找不到，则用默认的 resolvedDefaultDataSource。
+     * @return
+     */
     @Override
     protected Object determineCurrentLookupKey()
     {

hzgzpt-service-app/pom.xml

@@ -18,6 +18,12 @@
             <artifactId>hzgzpt-common</artifactId>
         </dependency>
 
+        <!-- 核心模块-->
+        <dependency>
+            <groupId>com.miaxis</groupId>
+            <artifactId>hzgzpt-framework</artifactId>
+        </dependency>
+
     </dependencies>