Merge remote-tracking branch 'origin/master'

nbjk-admin/src/main/java/com/miaxis/app/controller/video/VideoTeachingController.java

@@ -0,0 +1,104 @@
+package com.miaxis.app.controller.video;
+
+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.core.page.ResponsePageInfo;
+import com.miaxis.common.enums.BusinessTypeEnum;
+import com.miaxis.common.utils.poi.ExcelUtil;
+import com.miaxis.video.domain.VideoTeaching;
+import com.miaxis.video.service.IVideoTeachingService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 【教练视频】Controller
+ *
+ * @author miaxis
+ * @date 2023-02-20
+ */
+@RestController
+@RequestMapping(Constants.STUDENT_PREFIX+"/video/teaching")
+@Api(tags={"【app-教练视频】"})
+public class VideoTeachingController extends BaseController{
+    @Autowired
+    private IVideoTeachingService videoTeachingService;
+
+    /**
+     * 查询教练视频列表
+     */
+    @GetMapping("/list")
+    @ApiOperation("查询教练视频列表")
+        @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+    })
+    public ResponsePageInfo<VideoTeaching> list(@ModelAttribute VideoTeaching videoTeaching){
+        startPage();
+        List<VideoTeaching> list = videoTeachingService.selectVideoTeachingList(videoTeaching);
+        return toResponsePageInfo(list);
+    }
+    
+    /**
+     * 导出教练视频列表
+     */
+
+    @Log(title = "教练视频", businessType = BusinessTypeEnum.EXPORT)
+    @GetMapping("/export")
+    @ApiOperation("导出教练视频列表Excel")
+    public Response<String> export(@ModelAttribute VideoTeaching videoTeaching){
+        List<VideoTeaching> list = videoTeachingService.selectVideoTeachingList(videoTeaching);
+        ExcelUtil<VideoTeaching> util = new ExcelUtil<VideoTeaching>(VideoTeaching.class);
+        return util.exportExcel(list, "teaching");
+    }
+
+    /**
+     * 获取教练视频详细信息
+     */
+    @GetMapping(value = "/{id}")
+    @ApiOperation("获取教练视频详细信息")
+    public Response<VideoTeaching> getInfo(
+            @ApiParam(name = "id", value = "教练视频参数", required = true)
+            @PathVariable("id") Long id
+    ){
+        return Response.success(videoTeachingService.getById(id));
+    }
+
+    /**
+     * 新增教练视频
+     */
+    @Log(title = "教练视频", businessType = BusinessTypeEnum.INSERT)
+    @PostMapping
+    @ApiOperation("新增教练视频")
+    public Response<Integer> add(@RequestBody VideoTeaching videoTeaching){
+        return toResponse(videoTeachingService.save(videoTeaching) ? 1 : 0);
+    }
+
+    /**
+     * 修改教练视频
+     */
+    @Log(title = "教练视频", businessType = BusinessTypeEnum.UPDATE)
+    @PutMapping
+    @ApiOperation("修改教练视频")
+    public Response<Integer> edit(@RequestBody VideoTeaching videoTeaching){
+        return toResponse(videoTeachingService.updateById(videoTeaching) ? 1 : 0);
+    }
+
+    /**
+     * 删除教练视频
+     */
+    @Log(title = "教练视频", businessType = BusinessTypeEnum.DELETE)
+	@DeleteMapping("/{ids}")
+    @ApiOperation("删除教练视频")
+    public  Response<Integer> remove(
+            @ApiParam(name = "ids", value = "教练视频ids参数", required = true)
+            @PathVariable Long[] ids
+    ){
+        return toResponse(videoTeachingService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
+    }
+}

nbjk-admin/src/main/resources/application-dev.yml

@@ -10,13 +10,6 @@ spring:
                 url: jdbc:mysql://1.15.26.233:3307/nbjk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password: miaxis110
-            # 从库数据源
-            newgzpt:
-                # 从数据源开关/默认关闭
-                enabled: true
-                url: jdbc:oracle:thin:@47.99.70.145:1521:orcl
-                username: newgzpt
-                password: newgzpt2016
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -84,9 +77,9 @@ spring:
         # 配置 SMTP 服务器地址
         host: smtp.163.com
         # 发送者邮箱
-        username: miaxis2022@163.com
+        username: xmze2023@163.com
         # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
-        password: MNSJPUNHYXDIHTGF
+        password: JOAHFDRHRSIQNVEL
         # 端口号465或587
         port: 25
         # 默认的邮件编码为UTF-8

nbjk-admin/src/main/resources/application-prod.yml

@@ -10,13 +10,7 @@ spring:
                 url: jdbc:mysql://sh-cdb-2y9n2832.sql.tencentcdb.com:60123/nbjk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password: Miaxis@2020
-            # 从库数据源
-            newgzpt:
-                # 从数据源开关/默认关闭
-                enabled: true
-                url: jdbc:oracle:thin:@47.99.70.145:1521:orcl
-                username: newgzpt
-                password: newgzpt2016
+
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -86,9 +80,9 @@ spring:
         # 配置 SMTP 服务器地址
         host: smtp.163.com
         # 发送者邮箱
-        username: miaxis2022@163.com
+        username: xmze2023@163.com
         # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
-        password: MNSJPUNHYXDIHTGF
+        password: JOAHFDRHRSIQNVEL
         # 端口号465或587
         port: 25
         # 默认的邮件编码为UTF-8

nbjk-admin/src/main/resources/application-prodtest.yml

@@ -10,13 +10,6 @@ spring:
                 url: jdbc:mysql://sh-cdb-2y9n2832.sql.tencentcdb.com:60123/nbjk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
                 password: Miaxis@2020
-            # 从库数据源
-            newgzpt:
-                # 从数据源开关/默认关闭
-                enabled: true
-                url: jdbc:oracle:thin:@47.99.70.145:1521:orcl
-                username: newgzpt
-                password: newgzpt2016
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -83,9 +76,9 @@ spring:
         # 配置 SMTP 服务器地址
         host: smtp.163.com
         # 发送者邮箱
-        username: miaxis2022@163.com
+        username: xmze2023@163.com
         # 配置密码，注意不是真正的密码，而是刚刚申请到的授权码
-        password: MNSJPUNHYXDIHTGF
+        password: JOAHFDRHRSIQNVEL
         # 端口号465或587
         port: 25
         # 默认的邮件编码为UTF-8
@@ -98,19 +91,22 @@ spring:
                 #表示开启 DEBUG 模式，这样，邮件发送过程的日志会在控制台打印出来，方便排查错误
                 debug: true
 
-# 中振科技微信公众号
-zzgzh:
-    appId: wx3043c2c1decb01ed
-    appSecret: 8ae5d448d9b0778142d38d551c221ad3
-
 # 微信app端
 app:
     appId: wxfb80ed2dac7a6bb9
     appSecret: ac7eb47efc59f3cdbec46d3bf3a68627
 
-dy:
-    appId: awbewr7xlianfnew
-    appSecret: dd979dc2a5ddcc0c761fcbe899d87ba1
+# 微信公众号
+gzh:
+    appId: wx457ba48e0801c0b6
+    appSecret: 0212a4fc020cdc0c968eb17126d5fee1
+
+# 小程序
+xcx:
+    appId: wx97bbc22daac9362a
+    appSecret: e67435002c220ef2f69a1b43508c61ec
+
+
 
 # 微信支付
 wxpay:

nbjk-admin/src/main/resources/banner.txt

@@ -1,11 +1,11 @@
- .----------------.  .----------------.  .-----------------. .----------------.
+ .----------------.  .----------------.  .----------------.  .----------------.
 | .--------------. || .--------------. || .--------------. || .--------------. |
-| |   ________   | || |   ________   | || | ____  _____  | || |   ______     | |
-| |  |  __   _|  | || |  |  __   _|  | || ||_   \|_   _| | || |  |_   _ \    | |
-| |  |_/  / /    | || |  |_/  / /    | || |  |   \ | |   | || |    | |_) |   | |
-| |     .'.' _   | || |     .'.' _   | || |  | |\ \| |   | || |    |  __'.   | |
-| |   _/ /__/ |  | || |   _/ /__/ |  | || | _| |_\   |_  | || |   _| |__) |  | |
-| |  |________|  | || |  |________|  | || ||_____|\____| | || |  |_______/   | |
+| |     ______   | || |  _________   | || |     _____    | || |  ___  ____   | |
+| |   .' ___  |  | || | |  _   _  |  | || |    |_   _|   | || | |_  ||_  _|  | |
+| |  / .'   \_|  | || | |_/ | | \_|  | || |      | |     | || |   | |_/ /    | |
+| |  | |         | || |     | |      | || |   _  | |     | || |   |  __'.    | |
+| |  \ `.___.'\  | || |    _| |_     | || |  | |_' |     | || |  _| |  \ \_  | |
+| |   `._____.'  | || |   |_____|    | || |  `.___.'     | || | |____||____| | |
 | |              | || |              | || |              | || |              | |
 | '--------------' || '--------------' || '--------------' || '--------------' |
- '----------------'  '----------------'  '----------------'  '----------------'
+ '----------------'  '----------------'  '----------------'  '----------------'

nbjk-common/src/main/java/com/miaxis/common/enums/DataSourceTypeEnum.java

@@ -10,10 +10,5 @@ public enum DataSourceTypeEnum
     /**
      * 主库
      */
-    MASTER,
-
-    /**
-     * 新公众平台库
-     */
-    NEWGZPT
+    MASTER
 }

nbjk-common/src/main/java/com/miaxis/common/sign/PlatUtil.java

@@ -1,628 +0,0 @@
-package com.miaxis.common.sign;
-
-import java.io.*;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 省计时平台接口访问常量
- * */
-public class PlatUtil {
-	/** 下发IP地址及端口 */
-	public static String dl_weUser="1598BAE7757";
-	public static String issueHttpServerPath = "";
-	public static String sld_img_path = "http://122.lnjppt.com/sytmp/";
-	public static String sld_save_Path = "E://newproject//webapp//tms//src//main//webapp//upload//sld//";
-	public static String jyz_save_Path = "E://newproject//webapp//tms//src//main//webapp//upload//jyz//";
-
-	public static String contract_save_Path = "E://contract//";//学员培训合同保存路径
-	public static String contract_temp_Path = "E://ht.pdf";//学员培训合同模板路径
-	public static String sld_temp_path="E:\\sld.pdf";
-	public static String jyz_temp_path="E:\\jyz.pdf";
-	public static String file_savepath = "/media/html/tms/upload/";
-	public static String wxUrl = ""; //微信分享有效地址(项目地址)
-	public static String wxImgFile = ""; //微信顶部图片路径(文件夹)
-	public static String wxName = ""; //微信公众号名称
-	public static String gzpt_sbh = "3500"; //省编号,默认
-	public static String gzpt_dqbh = "3501"; //地市编号,默认
-	public static String gzpt_dblink = "newgzpt";//默认
-	public static String isAudit = "1";
-	public static String open_aduit = "1";
-	public static String tmp_dblink = "tmpfj";
-	public static String tms_dblink = "tmpfj";
-	public static String project_url = "http://fj.jppt.com.cn/xmjspt/";
-	public static String loaclPath_qianzhang = "/media/html/tms_qianzhang";
-	public static String device_img_path = "http://fj.jppt.com.cn/xmtmsphoto/";
-	public static String dm92_img_path = "http://fj.jppt.com.cn/xmtmsphoto/";
-	public static String device_video_path = "http://image.lnjppt.com/";
-	public static String lntmpservice = "http://127.0.0.1:8099/lntmpservice";
-	public static String device_tmp_img_path="";//省监管平台终端照片访问路径
-	public static String useross="useross_"; //单点登录特征值
-	public static String face_photo_path = "";//人脸比对照片路径
-	public static String term_pic_path = "/media/html/photo/upload/";//模拟器签到照片上次路径
-	//安卓_APP下载(教练/学员/驾校/运管)
-	public static String downAppJL_Android = "";
-	public static String downAppXY_Android = "";
-	public static String downAppJX_Android = "";
-	public static String downAppYG_Android = "";
-	//IOS_APP下载(教练/学员/驾校/运管)
-	public static String downAppJL_IOS = "";
-	public static String downAppXY_IOS = "";
-	public static String downAppJX_IOS = "";
-	public static String downAppYG_IOS = "";
-
-	/**实时视频参数*/
-	public static  String video_resolution = "";//分辨率
-	public static  String video_chaneId = "";//通道号
-	public static  String video_stram = "";//码流
-	public static  String video_audio = "";//音频
-	public static  String video_ip = "";//登入IP
-	public static  String video_loginPort = "";//登入端口
-	public static  String video_appId = "";//应用ID
-	public static  String  video_displayCode = "";//登入显示用户名
-	public static  String  video_roomNum = "";//房间数量
-	public static  String sso_open = "1";
-	public static String sso_url = "http://fj.jppt.com.cn/sso";
-
-	public static String httpServer_LeaveCoach = "leaveCoach";
-	public static String businessType_leaveCoach = "leaveCoach";
-
-	public static String ip_dir = "/media/html/ip_data/";
-	public static boolean isIpInit = false;
-	public static String saveFile = "";
-	/** HTTP接口协议: 协议版本(目前使用“1.0.0.e2”。其中e？代表所使用的加密算法，e1:SHA1，e2:SHA-256，e3:SHA-512。) */
-	public static final String url_version = "1.0.0.e2";
-	/** 私钥路径 */
-//	public static  String privateKeyUrl = "/classes/fujianzhongzhen.pfx";
-	public static  String privateKeyUrl = "/classes/zs/fujianzhongzhen.pfx";
-	public static  String keyPassword = "Zz2314";
-
-	public static final String platnum = "A0148";
-	/** 加密方式 */
-	public static final String url_version_type = "SHA-256";
-	/** 日志-业务编号: XmjpSch(培训机构) */
-	public static final String businessCode_XmjpSch = "XmjpSch";
-	/** 日志-业务编号: XmjpCoach(教练员) */
-	public static final String businessCode_XmjpCoach = "XmjpCoachInfo";
-	/** 日志-业务编号: XmjpStudent(学员) */
-	public static final String businessCode_Student = "Student";
-	/** 日志-业务编号: XmjpSchArae(教学区域) */
-	public static final String businessCode_XmjpSchArae = "XmjpSchArae";
-	/** 日志-业务编号: ExaminerInfo(考核员) */
-	public static final String businessCode_ExaminerInfo = "ExaminerInfo";
-	/** 日志-业务编号: EecurityInfo(安全员) */
-	public static final String businessCode_EecurityInfo = "EecurityInfo";
-	/** 日志-业务编号: XmjpCar(教练车) */
-	public static final String businessCode_XmjpCar = "XmjpCar";
-	/** 日志-业务编号: AppReservePayConfig(收费标准) */
-	public static final String businessCode_AppReservePayConfig = "AppReservePayConfig";
-	/** 日志-业务编号: XmjpDevice(计时终端) */
-	public static final String businessCode_XmjpDevice = "XmjpDevice";
-	/** 日志-业务编号: XmjpRegion(围栏) */
-	public static final String businessCode_XmjpRegion = "XmjpRegion";
-	/** 日志-业务编号: TerminateMachine(计时终端) */
-	public static final String businessCode_TerminateMachine = "TerminateMachine";
-	/** 日志-业务编号: Eval(评价信息) */
-	public static final String businessCode_Eval= "eval";
-	/** 日志-业务编号: Complaint(投诉信息) */
-	public static final String businessCode_Complaint= "complaint";
-	/** 日志-业务编号: LogSign(签到签退信息) */
-	public static final String businessCode_LogSign = "logSign";
-	/** 日志-业务编号: Msg(消息通知) */
-	public static final String businessCode_Msg= "msg";
-	/** 日志-业务编号: XmjpPoint(报名点) */
-	public static final String businessCode_XmjpPoint = "XmjpPoint";
-	/** 日志-业务编号: XmjpTheoryRoom(理论教室) */
-	public static final String businessCode_XmjpTheoryRoom = "XmjpTheoryRoom";
-	/** 日志-业务编号: XmjpSchPublicRegion(经营训练场地) */
-	public static final String businessCode_XmjpSchPublicRegion = "XmjpSchPublicRegion";
-	/** 日志-业务编号: XmjpStudentClassOpen(历史学员开班) */
-	public static final String businessCode_XmjpStudentClassOpen = "XmjpStudentClassOpen";
-
-	public static  String default_photo= "TerminateMachine";
-
-	/** 日志-业务编号: XmjpStudentClassOpen(历史学员开班) */
-	public static final String businessCode_Imageup = "Imageup";
-	/** 日志-业务编号: 浙江表A.75　学时异常查询接口定义 */
-	public static final String businessCode_abnormal = "abnormal";
-
-	/** 日志-业务编号: 浙江表A.67　阶段送审信息查询接口定义 */
-	public static final String businessCode_querystage = "querystage";
-
-	/** 日志-业务编号: 浙江表表A.59　终端备案关系查询接口定义 */
-	public static final String businessCode_searchDevice = "searchDevice";
-	/**
-	 * <p>业务名称Map:</p>
-	 */
-	@SuppressWarnings("serial")
-	public final static Map<String, String> businessCodeMap = new HashMap<String, String>(){{
-		put(businessCode_XmjpSch, "培训机构");
-		put(businessCode_XmjpCoach, "教练员");
-		put(businessCode_Student, "学员");
-		put(businessCode_XmjpSchArae, "教学区域");
-		put(businessCode_ExaminerInfo, "考核员");
-		put(businessCode_EecurityInfo, "安全员");
-		put(businessCode_XmjpCar, "教练车");
-		put(businessCode_AppReservePayConfig,"收费标准");
-		put(businessCode_TerminateMachine,"计时终端");
-		put(businessCode_Eval,"评价信息");
-		put(businessCode_Complaint,"投诉信息");
-		put(businessCode_LogSign,"签到签退");
-		put(businessCode_Msg,"消息通知");
-		put(businessCode_XmjpPoint,"报名点");
-		put(businessCode_XmjpTheoryRoom,"理论教室");
-		put(businessCode_XmjpSchPublicRegion,"经营训练场地");
-		put(businessCode_XmjpStudentClassOpen,"历史学员开班");
-		put(businessCode_searchDevice,"终端备案关系查询接");
-	}};
-	/** 日志-业务类型: 全国平台预录入 */
-	public static final String businessType_schbaseaddQgpt = "全国平台预录入";
-	/** 日志-业务类型: 省平台预录入 */
-	public static final String businessType_schbaseaddSpt = "省平台预录入";
-	/** 日志-业务类型: 获取统一编码 */
-	public static final String businessType_code = "获取统一编码";
-	/** 日志-业务类型: 查询统一编码 */
-	public static final String businessType_codeSelect = "查询统一编码";
-	/** 日志-业务类型: 新增备案 */
-	public static final String businessType_add_record = "新增备案";
-	/** 日志-业务类型: 修改备案 */
-	public static final String businessType_upd_record = "修改备案";
-	/** 日志-业务类型: 备案 */
-	public static final String businessType_record = "备案";
-	/** 日志-业务类型: 跨培训机构备案 */
-	public static final String businessType_record_kpxjg = "跨培训机构备案";
-	/** 日志-业务类型: 修改 */
-	public static final String businessType_upd = "修改";
-	/** 日志-业务类型: 新增修改 */
-	public static final String businessType_add_upd = "新增修改";
-	/** 日志-业务类型: 删除 */
-	public static final String businessType_del = "删除";
-	/** 日志-业务类型: 查询 */
-	public static final String businessType_sel = "查询";
-	/** 日志-业务类型: 上传照片 */
-	public static final String businessType_pic = "上传照片";
-	/** 日志-业务类型: 分钟学时补传 */
-	public static final String businessType_min = "分钟学时补传";
-	/** 日志-业务类型: 评价信息交换 */
-	public static final String businessType_evaljh = "评价信息交换";
-	/** 日志-业务类型: 投诉信息交换 */
-	public static final String businessType_complaintjh = "投诉信息交换";
-	/** 日志-业务类型: 评价信息查询 */
-	public static final String businessType_eval = "评价信息查询";
-	/** 日志-业务类型: 投诉信息查询 */
-	public static final String businessType_complaint = "投诉信息查询";
-	/** 日志-业务类型: 训练照片上传 */
-	public static final String businessType_trainimgInfo = "训练照片上传";
-	/** 日志-业务类型: 训练视频上传 */
-	public static final String businessType_videoRecord = "训练视频上传";
-	/** 日志-业务类型: 电子教学日志上传 */
-	public static final String businessType_classRecord = "电子教学日志上传";
-	/** 日志-业务类型: 阶段学时上报 */
-	public static final String businessType_stageTrainningTime = "阶段学时上报";
-	/** 日志-业务类型: 阶段学时上报 */
-	public static final String businessType_graduation = "学员结业备案";
-	/** 日志-业务类型: 绑定教练车 */
-	public static final String businessType_bindCar = "绑定教练车";
-
-	/** 日志-业务类型:绑定模拟  */
-	public static final String httpServer_BindSimulator = "绑定模拟器";
-
-	/** 日志-业务类型: 解绑教练车 */
-	public static final String businessType_unBindCar = "解绑教练车";
-
-	/** 日志-业务类型: 解绑模拟器 */
-	public static final String businessType_unBindSimulator = "解绑模拟器";
-
-	/** 日志-业务类型: 解绑教练车 */
-	public static final String businessType_altConnect = "变更在线状态";
-	/** 日志-业务类型: 审核结果消息通知 */
-	public static final String businessType_reviewmsg = "审核结果";
-	/** 日志-业务类型: 备案关系变更消息通知 */
-	public static final String businessType_recordchangemsg = "备案关系变更";
-	/** 日志-业务类型: 基础信息审核关系变更消息通知 */
-	public static final String businessType_recordauditmsg = "基础信息审核关系变更";
-	/** 日志-业务类型: 锁定与解除锁定消息通知 */
-	public static final String businessType_recordlockmsg = "锁定与解除锁定关系变更";
-	/** 日志-业务类型: 驾校通知下发 */
-	public static final String businessType_schoolnoticesend = "驾校通知下发";
-	/** 日志-业务类型: 查询统一编码 */
-	public static final String businessType_codeSelecte = "查询统一编码";
-	/** 日志-业务类型: 签到签退信息 */
-	public static final String businessType_logSign = "签到签退";
-	/** 日志-业务类型: 备案关系变更消息通知 */
-	public static final String businessType_auditrecord = "备案审核通知";
-	/** 日志-业务类型: 备案关系变更消息通知 */
-	public static final String businessType_schoolModifyLimit = "更新培训机构人数限制";
-
-	/** 日志-业务类型: 新增备案 */
-	public static final String businessType_Change = "转校申请";
-	/** 日志-业务类型: 历史学员阶段学时上报 */
-	public static final String businessType_stageTrainningTimeHistory = "历史学员阶段学时上报";
-	/** 日志-业务类型: 获取最后GPS点信息 */
-	public static final String businessType_getLastGpsBySim = "获取最后GPS点信息";
-	/** 日志-业务类型: 获取设备视频房间 */
-	public static final String businessType_getDeviceVideoByDeviceNum = "获取设备视频房间";
-	/** 日志-业务类型: 根据全国编号获取教练信息 */
-	public static final String businessType_getCoachByObjnum = "根据全国编号获取教练信息";
-	/** 日志-业务类型: 表A.72　电子教学日志按时间查询 */
-	public static final String businessType_queryclassrecord = "电子教学日志按时间查询";
-	/** 日志-业务类型: 　表A.69　分钟学时按时间查询 */
-	public static final String businessType_querytrainrecord = "分钟学时按时间查询";
-	/** 日志-业务类型: 　表A.63　分钟学时备案结果查询 */
-	public static final String businessType_trainrecord = "分钟学时备案结果查询";
-	/** 日志-业务类型: 　表A.61　电子教学日志备案结果查询*/
-	public static final String businessType_classrecord = "电子教学日志备案结果查询";
-	/** 日志-业务类型: 刷卡类型变更 */
-	public static final String businessType_changecardtype = "刷卡类型变更";
-	/** 日志-业务类型: 新增备案 */
-	public static final String businessType_Student_Change = "转校申请";
-
-	public static final String businessType_abnormal = "学时异常查询接";
-	public static final String businessType_querystage = "阶段送审信息查询";
-	public static final String businessType_queryPoliceState = "阶段送审记录推送交警查询";
-	public static final String businessType_transferrecord = "学员各部分学时查询";
-	/** 日志-业务类型: 学员合同上传 */
-	public static final String businessType_studentcontract = "学员合同上传";
-	/** 日志-业务类型: 车辆证审核提交 */
-	public static final String businessType_carLicense = "车辆证审核提交";
-	/** 日志-业务类型: 车辆等级评定审核提交 */
-	public static final String businessType_vehicleClass = "车辆登记评定审核提交";
-	/** 日志-业务类型: 车辆保险修改提交 */
-	public static final String businessType_updateCarInsurance = "车辆保险修改提交";
-	/** 日志-业务类型: IC卡申请审核提交 */
-	public static final String businessType_applyCard="ID卡申请审核提交";
-	/** 日志-业务类型：学时异常审核通知*/
-	public static final String businessType_reviewabnormal="学时异常审核通知";
-	/** 返回码: -99(系统错误日记) */
-
-	public static final String businessType_studentScore="学员考试成绩";
-
-	public static final String businessType_studenttransfer="异地学员转入";
-
-
-
-
-	public static final String errorcode_system = "-99";
-	/** 返回码: -99(系统错误日记) */
-	public static final String errorcode_exceptionText = "服务异常";
-	/** 返回码: 0(执行成功/数据上传成功) */
-	public static final String errorcode_0 = "0";
-	/** 返回码: 1(执行失败) */
-	public static final String errorcode_1 = "1";
-	/** 返回码: 100(请求的服务/资源不存在) */
-	public static final String errorcode_100 = "100";
-	/** 返回码: 200(数据格式错误，无法正确解析) */
-	public static final String errorcode_200 = "200";
-	/** 返回码: 201(时间戳重复) */
-	public static final String errorcode_201 = "201";
-	/** 返回码: 202(证书无法通过验证) */
-	public static final String errorcode_202 = "202";
-	/**
-	 * <p>返回码Map:</p>
-	 * <p>	0(执行成功/数据上传成功)</p>
-	 * <p>	1(执行失败)</p>
-	 * <p>	100(请求的服务/资源不存在)</p>
-	 * <p>	200(数据格式错误，无法正确解析)</p>
-	 * <p>	201(时间戳重复)</p>
-	 * <p>	202(证书无法通过验证)</p>
-	 */
-	@SuppressWarnings("serial")
-	public final static Map<String, String> errorcodeMap = new HashMap<String, String>(){{
-		put("0", "执行成功/数据上传成功");
-		put("1", "执行失败");
-		put("100", "请求的服务/资源不存在");
-		put("200", "数据格式错误，无法正确解析");
-		put("201", "时间戳重复");
-		put("202", "证书无法通过验证");
-	}};
-
-
-	/** 接口服务名:Schbaseadd(全国、省平台预录入) 20190618全国平台预录入新的方支*/
-	public static final String httpServer_Schbaseadd_new = "preinstitution";
-	/** 接口服务名:Schbaseadd(全国、省平台预录入) */
-	public static final String httpServer_Schbaseadd = "schbaseadd";
-	/** 接口服务名:Institution(新增培训机构接口定义) */
-	public static final String httpServer_Institution = "institution";
-	/** 接口服务名:Student(新增学员接口定义) */
-	public static final String httpServer_Student = "student";
-	/** 接口服务名:Student(新增历史学员接口定义) */
-	public static final String httpServer_HistoryStudent = "historyStudent";
-	/** 接口服务名:Student(学员全国统一编号查询方法) */
-	public static final String httpServer_stuinfo = "stuinfo";
-	/** 接口服务名:Student(跨培训机构备案方法) */
-	public static final String httpServer_Transfer = "transfer";
-	/** 接口服务名:Student(投诉信息交换方法) */
-	public static final String httpServer_Complaint = "complaint";
-	/** 接口服务名:Student(投诉信息交换方法) */
-	public static final String httpServer_Abnormal = "abnormal";
-	/** 接口服务名:Student(投诉信息查询方法) */
-	public static final String httpServer_ComplaintQuery = "complaintquery";
-	/** 接口服务名:Student(评价信息交换方法) */
-	public static final String httpServer_Evaluation = "evaluation";
-	/** 接口服务名:Student(评价信息查询方法) */
-	public static final String httpServer_EvaluationQuery = "evaluationquery";
-	/** 接口服务名:region */
-	public static final String httpServer_Region = "region";
-	/** 接口服务名:Theoryroom */
-	public static final String httpServer_Theoryroom = "theoryroom";
-	/** 接口服务名:coach(新增教练员接口) */
-	public static final String httpServer_Coach = "coach";
-	/** 接口服务名:Examiner(新增考核员接口) */
-	public static final String httpServer_Examiner = "examiner";
-	/** 接口服务名:Securityguard(新增安全员接口) */
-	public static final String httpServer_Securityguard = "securityguard";
-	/** 接口服务名:TrainingCar(新增教练车接口) */
-	public static final String httpServer_TrainingCar = "trainingcar";
-	/** 接口服务名:TrainingCar(新增教练车接口) */
-	public static final String httpServer_trainingCar = "trainingCar";
-	/** 接口服务名:region */
-	public static final String httpServer_RegionReview = "regionreview";
-	/** 接口服务器:CharStandard */
-	public static final String httpServer_CharStandard = "CharStandard";
-	/** 接口服务器:Imageup (文件资料信息上传) */
-	public static final String httpServer_Imageup = "imageup";
-	/** 接口服务器:Imageup (文件资料信息查看) */
-	public static final String httpServer_ImageSel = "imageSel";
-	/** 接口服务器:Imageup (文件资料信息删除) */
-	public static final String httpServer_ImageDel = "imageDel";
-	/** 接口服务器:计时终端设备  */
-	public static final String httpServer_Device = "device";
-	/** 接口服务器:模拟器设备  */
-	public static final String httpServer_TrainingSimulator = "simulator";
-	/** 接口服务器:培训照片上传  */
-	public static final String httpServer_Trainimginfo = "trainimginfo";
-	/** 接口服务器:培训视频上传  */
-	public static final String httpServer_VideoRecord = "videoRecord";
-	/** 接口服务器:电子教学日志上传  */
-	public static final String httpServer_ClassRecord = "classrecord";
-	/** 接口服务器:阶段培训记录上报  */
-	public static final String httpServer_StageTrainningTime = "stagetrainningtime";
-	/** 接口服务器:阶段培训记录上报  */
-	public static final String httpServer_StageTrainningTimeN = "stagetrainningtimeN";
-	/** 接口服务器:结业备案  */
-	public static final String httpServer_Graduation = "graduation";
-	/** 接口服务器:表A.75　阶段学时审核结果查询 */
-	public static final String httpServer_StageTrainningTimeReview = "stagetrainningtimereview";
-	/** 接口服务器:车载计程计时终端绑定  */
-	public static final String httpServer_Devassign = "devassign";
-	/** 接口服务器:模拟器终端绑定  */
-	public static final String httpServer_BindSimulatordev = "bindSimulatordev";
-	/** 接口服务器:车载计程计时终端解绑  */
-	public static final String httpServer_DevRembinding = "devRembinding";
-	/** 接口服务器:模拟器终端解绑  */
-	public static final String httpServer_Removesimulatordevbind = "removesimulatordevbind";
-	/** 接口服务器:车载计程计时终端在线状态变更  */
-	public static final String httpServer_DevAltConnect = "devAltConnect";
-	/** 接口服务器:审核结果消息通知接口  */
-	public static final String httpServer_Reviewmsg = "reviewmsg";
-	/** 接口服务器:备案关系变更消息通知接口  */
-	public static final String httpServer_Recordchangemsg = "recordchangemsg";
-	/** 接口服务器:基础信息审核关系变更消息通知接口  */
-	public static final String httpServer_RecordAuditmsg = "recordAuditmsg";
-	/** 接口服务器:锁定关系变更消息通知接口  */
-	public static final String httpServer_RecordLockmsg = "recordLockmsg";
-	/** 接口服务器:驾校通知下发接口  */
-	public static final String httpServer_SchoolNoticeSend = "schoolnoticesend";
-	/** 接口服务器:分钟学时接收接口  */
-	public static final String httpServer_MinTrainingTime = "mintrainingtime";
-	/** 接口服务器:GPS接收接口  */
-	public static final String httpServer_Gps= "gps";
-	/** 接口服务器:签到签退接口  */
-	public static final String httpServer_LogSign= "logSign";
-	/** 同步历史学员里程 */
-	public static final String httpServer_GetTrainMile = "getTrainMile";
-	/** 同步历史学员训练照片 */
-	public static final String httpServer_GetTrainPhoto = "getTrainPhoto";
-	/** 获取历史学员培训信息*/
-	public static final String httpServer_GetStuHistoryDetail = "getStuHistoryDetail";
-	/** 获取历史学员培训坐标点 */
-	public static final String httpServer_GetStuHistoryGps = "getStuHistoryGps";
-	/** 接口服务名:Schoolpoint(新增报名点接口定义) */
-	public static final String httpServer_Schoolpoint = "schoolpoint";
-	/** 接口服务名:Schooltheoryroom(新增理论教室接口定义) */
-	public static final String httpServer_Schooltheoryroom = "schooltheoryroom";
-	/** 接口服务名:Studentlogout(新增学员退学接口定义) */
-	public static final String httpServer_Studentlogout = "studentlogout";
-	/** 接口服务名:Schoolpublicregion(新增经营训练场接口定义) */
-	public static final String httpServer_Schoolpublicregion = "schoolpublicregion";
-	/** 接口服务名:Schoolpublicregioncar(新增经营训练场车辆入驻接口定义) */
-	public static final String httpServer_Schoolpublicregioncar = "schoolpublicregioncar";
-	/** 接口服务名:Stagetrainningtimehistory(历史学员阶段培训记录上报接口定义) */
-	public static final String httpServer_Stagetrainningtimehistory = "stagetrainningtimehistory";
-	/** 接口服务名:classopen(历史学员开班记录上报/修改接口定义) */
-	public static final String httpServer_classopen = "classopen";
-	/** 接口服务器:jsimageup (文件资料信息上传) */
-	public static final String httpServer_jsimageup = "jsimageup";
-	/** 接口服务器:计时培训图片上传接口，用于TCP上传失败时使用  */
-	public static final String httpServer_Jsimageup = "Jsimageup";
-	/** 接口服务器:计时培训分钟学时补传，用于TCP上传失败时使用  */
-	public static final String httpServer_JsTrainminup = "JsTrainminup";
-	/** 接口服务器:同步消息接口  */
-	public static final String httpServer_SyncStudent = "syncStudent";
-	/** 获取驾校签章 **/
-	public static final String httpServer_GetJxQz = "getJxQz";
-	/** 获取最后GPS点信息 **/
-	public static final String httpServer_getLastGpsBySim = "getLastGpsBySim";
-	/** 获取房间号 **/
-	public static final String httpServer_getRoomNum = "getRoomNum";
-	/**获取设备视频房间**/
-	public static final String httpServer_getDeviceVideoByDeviceNum = "getDeviceVideoByDeviceNum";
-	/**修改学员名称**/
-	public static final String httpServer_updateStuState = "updateStuState";
-	/**  监管平台扩展接口20200108服务名:根据全国编号获取教练信息  */
-	public static final String httpServer_getCoachByObjnum = "getCoachByObjnum";
-
-	/** 接口服务器:扩展消息通知接口  */
-	public static final String httpServer_Msgnotify = "msgnotify";
-	/**  监管平台扩展接口:表A.72　电子教学日志按时间查询接口定义  */
-	public static final String httpServer_queryclassrecord = "queryclassrecord";
-	/**  监管平台扩展接口:表A.69　分钟学时按时间查询  */
-	public static final String httpServer_querytrainrecord = "querytrainrecord";
-	/**  监管平台扩展接口:表A.63　分钟学时备案结果查询  */
-	public static final String httpServer_trainrecord = "trainrecord";
-	/**  监管平台扩展接口:表A.61　电子教学日志备案结果查询  */
-	public static final String httpServer_classrecord = "classrecord";
-
-	/** 接口服务名:coach(教练通知结果查询) */
-	public static final String httpServer_SelectCoachNotify = "coach";
-
-	/** 接口服务名:trainingcar(教练车通知结果查询) */
-	public static final String httpServer_SelectTrainingcarNotify = "trainingcar";
-	/** 接口服务名:examiner(考核员通知结果查询) */
-	public static final String httpServer_SelectExaminerNotify = "examiner";
-	/** 接口服务名:examiner(安全员通知结果查询) */
-	public static final String httpServer_SelectSecurityguardNotify = "securityguard";
-	/** 接口服务名:institution(驾校通知结果查询) */
-	public static final String httpServer_SelectInstitutionNotify = "institution";
-	/** 接口服务名:device(终端通知结果查询) */
-	public static final String httpServer_SelectDeviceNotify = "device";
-	/** 接口服务名:region(围栏通知结果查询) */
-	public static final String httpServer_SelectRegionNotify = "region";
-	/** 接口服务名:Theoryroom(理论教室通知结果查询) */
-	public static final String httpServer_SelectTheoryroomNotify = "theoryroom";
-	/** 接口服务名:student(学员通知结果查询) */
-	public static final String httpServer_SelectStudentNotify = "student";
-	/** 接口服务名:contract(新增学员合同接口定义) */
-	public static final String httpServer_Student_Contract = "contract";
-	/** 接口服务名:contract(查询学员接口定义) */
-	public static final String httpServer_SearchStudent = "searchStudent";
-	/** 接口服务名:carLicense(车辆证审核接口定义) */
-	public static final String httpServer_carLicense = "carLicense";
-	/** 接口服务名:updateCarInsurance(车辆保险修改接口定义) */
-	public static final String httpServer_updateCarInsurance = "updateCarInsurance";
-
-	/** 接口服务名:vehicleClass(车辆等级评定审核接口定义) */
-	public static final String httpServer_vehicleClass = "vehicleClass";
-	/** 接口服务名:applyCard(IC卡申请审核接口定义) */
-	public static final String httpServer_applyCard = "applyCard";
-	/** 接口服务名:reviewabnormal(异常学时审核接口定义) */
-	public static final String httpServer_reviewabnormal = "reviewabnormal";
-	/** 接口服务名:coachLeave(教练员离职) */
-	public static final String httpServer_coachLeave = "coachLeave";
-	/** 接口服务名:coachLeave(学员异常日志申诉审核通知) */
-	public static final String httpServer_trainAppeal = "trainAppeal";
-
-	/** 接口服务名:carRembinding(车辆解绑教练员) */
-	public static final String httpServer_carRembinding = "carRembinding";
-
-	/**上传文件参数类型*/
-	public static final String file_stuimg = "stuimg";//学员头像
-	public static final String file_stufp = "stufp";//学员指纹
-	public static final String file_coachimg = "coachimg";//教练员头像
-	public static final String file_coachfp = "coachfp";//教练员指纹
-	public static final String file_examinerimg = "examinerimg";//考核员头像
-	public static final String file_examinerfp = "examinerfp";//考核员指纹
-	public static final String file_securityguardimg = "securityguardimg";//安全员头像
-	public static final String file_securityguardfg = "securityguardfg";//安全员指纹
-	public static final String file_vehimg = "vehimg";//教练车图片
-	public static final String file_outletsimg = "outletsimg";//招生点照片
-	public static final String file_occupationimg = "occupationimg";//资格证书图片
-	public static final String file_voiceprintimg = "voiceprintimg";//声纹文件
-	public static final String file_epdfimg = "epdfimg";//电子培训部分记录表PDF文件；
-	public static final String file_onlineimg = "onlineimg";//网络远程学习过程照片；
-	public static final String file_classroom = "classroom";//课堂教学过程照片；
-	public static final String file_simulation = "simulation";//模拟教学过程照片；
-	public static final String file_video = "video";//视频文件
-	public static final String file_region = "region";//电子围栏纸质文件
-	public static final String file_traincar = "traincar";//车辆附件文件上传接口
-	public static final String file_coachcontract = "coachcontract";//教练合同
-	public static final String file_stucontract = "stucontract";//学员培训协议
-	public static final String file_stuface = "stuface";//学员人脸模板
-	public static final String file_conimg = "conimg";//学员合同
-	public static final String file_transferschimg = "transferschimg";//异地转入合同
-
-	/** 接口服务名:TrainingCar(新增运政教练车新备修改接口) */
-	public static final String httpServer_TrainingCarYz = "addCarLicense";
-	/** 接口服务名:TrainingCar(运政车辆等级评定审核) */
-	public static final String httpServer_TrainingCar_VehicleClass = "vehicleClass";
-	/** 接口服务名:TrainingCar(新增运政教练车辆保险修改接口) */
-	public static final String httpServer_TrainingCar_UpdateCarInsurance = "updateCarInsurance";
-	/** 接口服务名:TrainingCar(新增运政教练车辆注销接口) */
-	public static final String httpServer_TrainingCar_RemoveCarLicense = "removeCarLicense";
-	/** 接口服务名:TrainingCar(新增运政教练车辆补发车辆证接口) */
-	public static final String httpServer_TrainingCar_ReissueCarLicense = "reissueCarLicense";
-
-	/** 接口服务名:TrainingCar(新增运政教练车辆证变更接口) */
-	public static final String httpServer_TrainingCar_UpdateCarLicense = "updateCarLicense";
-
-	/** 接口服务名:TrainingCar(补传车辆信息) */
-	public static final String httpServer_TrainingCar_UpdateCarFiles = "updateCarFiles";
-
-	/** 接口服务名:studentLogout(学员注销) */
-	public static final String httpServer_studentLogout = "studentLogout";
-
-	/** 接口服务名:studenttransfer(异地学员) */
-	public static final String httpServer_studenttransfer = "studenttransfer";
-
-	public static final String httpServer_studentScore = "studentScore";
-
-	/**
-	 * 用于查询全国平台统一编号列表
-	 */
-	@SuppressWarnings("serial")
-	public final static Map<String, String> qgptCodeMap = new HashMap<String, String>(){{
-		put(businessCode_XmjpSch, "培训机构");
-		put(businessCode_XmjpCoach, "教练员");
-		put(businessCode_Student, "学员");
-		put(businessCode_ExaminerInfo, "考核员");
-		put(businessCode_EecurityInfo, "安全员");
-		put(businessCode_XmjpCar, "教练车");
-		put(businessCode_TerminateMachine,"计时终端");
-	}};
-
-
-	// 返回一个byte数组
-	@SuppressWarnings("resource")
-	public static byte[] getBytesFromFile(File file) throws IOException {
-		InputStream is = new FileInputStream(file);
-		// 获取文件大小
-		long length = file.length();
-		if (length > Integer.MAX_VALUE) {
-			// 文件太大，无法读取
-			throw new IOException("File is to large " + file.getName());
-		}
-		// 创建一个数据来保存文件数据
-		byte[] bytes = new byte[(int) length];
-		// 读取数据到byte数组中
-		int offset = 0;
-		int numRead = 0;
-		while (offset < bytes.length&& (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0) {
-			offset += numRead;
-		}
-		// 确保所有数据均被读取
-		if (offset < bytes.length) {
-			throw new IOException("Could not completely read file "+ file.getName());
-		}
-		is.close();
-		return bytes;
-	}
-	public static byte[] getBytes(File file) {
-		byte[] buffer = null;
-		try {
-			FileInputStream fis = new FileInputStream(file);
-			ByteArrayOutputStream bos = new ByteArrayOutputStream(1000);
-			byte[] b = new byte[1000];
-			int n;
-			while ((n = fis.read(b)) != -1) {
-				bos.write(b, 0, n);
-			}
-			fis.close();
-			bos.close();
-			buffer = bos.toByteArray();
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return buffer;
-	}
-
-
-
-
-
-
-
-
-
-}

nbjk-common/src/main/java/com/miaxis/common/sign/Sign.java

@@ -1,38 +0,0 @@
-package com.miaxis.common.sign;
-
-import com.sun.org.apache.xerces.internal.impl.dv.util.HexBin;
-
-import javax.crypto.Cipher;
-import java.security.MessageDigest;
-import java.security.PrivateKey;
-
-@SuppressWarnings("restriction")
-public class Sign implements ISign {
-
-	public String sign(String data, long timestamp, PrivateKey key) throws Exception {
-		return sign(data.getBytes("utf-8"), timestamp, key);
-	}
-
-	public String sign(String data, PrivateKey key) throws Exception{
-		return sign(data.getBytes("utf-8"), 0, key);
-	}
-
-	public String sign(byte [] data, PrivateKey key) throws Exception {
-		return sign(data, 0, key);
-	}
-
-	public String sign(byte [] data, long timestamp, PrivateKey key) throws Exception {
-		MessageDigest md = MessageDigest.getInstance(PlatUtil.url_version_type);
-		md.update(data);
-		if(timestamp > 0){
-			md.update(EncodeUtil.toBE(timestamp));
-		}
-
-		byte[] hash = md.digest();
-		Cipher cipher = Cipher.getInstance("RSA");
-		cipher.init(Cipher.ENCRYPT_MODE, key);
-		byte[] encrypted = cipher.doFinal(hash);
-		return HexBin.encode(encrypted);
-	}
-
-}

nbjk-common/src/main/java/com/miaxis/common/sign/SignUtil.java

@@ -1,27 +0,0 @@
-package com.miaxis.common.sign;
-
-
-
-
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.util.Enumeration;
-
-/**
- */
-public class SignUtil {
-	public static String getSign(byte[] data)throws Exception{
-        String sign_str = ""; // 签名
-		KeyStore keyStore = KeyStore.getInstance("PKCS12");
-		Enumeration<String> aliases = keyStore.aliases();
-		if (!aliases.hasMoreElements()) { ;
-			throw new RuntimeException("HTTP接口协议签名获取失败: no alias found");
-		}
-		String alias = aliases.nextElement();
-		PrivateKey privateKey = (PrivateKey) keyStore.getKey(alias, PlatUtil.keyPassword.toCharArray()); // 私钥
-		ISign sign = new Sign();
-        long timestamp = System.currentTimeMillis(); // 时间戳
-        sign_str = sign.sign(data,timestamp , privateKey);
-        return sign_str;
-	}
-}

nbjk-common/src/main/java/com/miaxis/common/sign/Verify.java

@@ -1,50 +0,0 @@
-package com.miaxis.common.sign;
-
-import com.sun.org.apache.xerces.internal.impl.dv.util.HexBin;
-
-import javax.crypto.Cipher;
-import java.security.MessageDigest;
-import java.security.cert.X509Certificate;
-import java.util.Arrays;
-
-@SuppressWarnings("restriction")
-public class Verify implements IVerify {
-
-	public boolean verify(String data, long timestamp, String encodedEncryptedStr,
-			X509Certificate userCert) throws Exception
-	{
-		return verify(data.getBytes("utf-8"), timestamp, encodedEncryptedStr, userCert);
-	}
-
-	public boolean verify(String data, String encodedEncryptedStr,
-			X509Certificate userCert) throws Exception
-	{
-		return verify(data.getBytes("utf-8"), 0, encodedEncryptedStr, userCert);
-	}
-
-	public boolean verify(byte [] data, String encodedEncryptedStr,
-			X509Certificate userCert) throws Exception{
-		return verify(data, encodedEncryptedStr, userCert);
-	}
-
-
-	public boolean verify(byte [] data, long timestamp, String encodedEncryptedStr,
-			X509Certificate userCert) throws Exception
-	{
-		MessageDigest md = MessageDigest.getInstance(PlatUtil.url_version_type);
-		md.update(data);
-		if(timestamp > 0){
-			md.update(EncodeUtil.toBE(timestamp));
-		}
-
-		byte[] hash = md.digest();
-
-		byte[] encryptedStr = HexBin.decode(encodedEncryptedStr);
-		Cipher cipher = Cipher.getInstance("RSA");
-		cipher.init(Cipher.DECRYPT_MODE, userCert);
-		byte[] plain = cipher.doFinal(encryptedStr);
-		boolean ok = Arrays.equals(hash, plain);
-		return ok;
-	}
-
-}

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

@@ -38,26 +38,6 @@ public class DruidConfig
         return druidProperties.dataSource(dataSource);
     }
 
-    @Bean
-    @ConfigurationProperties("spring.datasource.druid.newgzpt")
-    //控制配置类是否生效 enabled为true时生效
-    @ConditionalOnProperty(prefix = "spring.datasource.druid.newgzpt", name = "enabled", havingValue = "true")
-    public DataSource newgzptDataSource(DruidProperties druidProperties)
-    {
-        DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
-        return druidProperties.dataSource(dataSource);
-    }
-
-    @Bean(name = "dynamicDataSource")
-    @Primary
-    public DynamicDataSource dataSource(DataSource masterDataSource)
-    {
-        Map<Object, Object> targetDataSources = new HashMap<>();
-        targetDataSources.put(DataSourceTypeEnum.MASTER.name(), masterDataSource);
-        setDataSource(targetDataSources, DataSourceTypeEnum.NEWGZPT.name(), "newgzptDataSource");
-        return new DynamicDataSource(masterDataSource, targetDataSources);
-    }
-
     /**
      * 设置数据源
      *

nbjk-service/src/main/java/com/miaxis/video/domain/VideoTeaching.java

@@ -0,0 +1,118 @@
+package com.miaxis.video.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.miaxis.common.annotation.Excel;
+import com.miaxis.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import lombok.Data;
+/**
+ * 教练视频对象 video_teaching
+ *
+ * @author miaxis
+ * @date 2023-02-20
+ */
+@Data
+@TableName("video_teaching")
+@ApiModel(value = "VideoTeaching", description = "教练视频对象 video_teaching")
+public class VideoTeaching extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    @ApiModelProperty(value = "$column.columnComment")
+    private Long id;
+
+    /** 视频名称 */
+    @Excel(name = "视频名称")
+    @TableField("video_name")
+    @ApiModelProperty(value = "视频名称")
+    private String videoName;
+
+    /** 视频封面 */
+    @Excel(name = "视频封面")
+    @TableField("video_cover")
+    @ApiModelProperty(value = "视频封面")
+    private String videoCover;
+
+    /** 视频地址 */
+    @Excel(name = "视频地址")
+    @TableField("video_url")
+    @ApiModelProperty(value = "视频地址")
+    private String videoUrl;
+
+    /** 1:科目一 2:科目二 3：科目三 4:科目四 */
+    @Excel(name = "1:科目一 2:科目二 3：科目三 4:科目四")
+    @TableField("video_subject")
+    @ApiModelProperty(value = "1:科目一 2:科目二 3：科目三 4:科目四")
+    private Long videoSubject;
+
+    /** 0未开启 1已开启 */
+    @Excel(name = "0未开启 1已开启")
+    @TableField("state")
+    @ApiModelProperty(value = "0未开启 1已开启")
+    private Long state;
+
+    public void setId(Long id){
+        this.id = id;
+    }
+
+    public Long getId(){
+        return id;
+    }
+    public void setVideoName(String videoName){
+        this.videoName = videoName;
+    }
+
+    public String getVideoName(){
+        return videoName;
+    }
+    public void setVideoCover(String videoCover){
+        this.videoCover = videoCover;
+    }
+
+    public String getVideoCover(){
+        return videoCover;
+    }
+    public void setVideoUrl(String videoUrl){
+        this.videoUrl = videoUrl;
+    }
+
+    public String getVideoUrl(){
+        return videoUrl;
+    }
+    public void setVideoSubject(Long videoSubject){
+        this.videoSubject = videoSubject;
+    }
+
+    public Long getVideoSubject(){
+        return videoSubject;
+    }
+    public void setState(Long state){
+        this.state = state;
+    }
+
+    public Long getState(){
+        return state;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("videoName", getVideoName())
+            .append("videoCover", getVideoCover())
+            .append("videoUrl", getVideoUrl())
+            .append("videoSubject", getVideoSubject())
+            .append("state", getState())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

nbjk-service/src/main/java/com/miaxis/video/mapper/VideoTeachingMapper.java

@@ -0,0 +1,22 @@
+package com.miaxis.video.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.miaxis.video.domain.VideoTeaching;
+
+/**
+ * 教练视频Mapper接口
+ *
+ * @author miaxis
+ * @date 2023-02-20
+ */
+public interface VideoTeachingMapper extends BaseMapper<VideoTeaching> {
+    /**
+     * 查询教练视频列表
+     *
+     * @param videoTeaching 教练视频
+     * @return 教练视频集合
+     */
+    public List<VideoTeaching> selectVideoTeachingList(VideoTeaching videoTeaching);
+
+}

nbjk-service/src/main/java/com/miaxis/video/service/IVideoTeachingService.java

@@ -0,0 +1,21 @@
+package com.miaxis.video.service;
+
+import java.util.List;
+import com.miaxis.video.domain.VideoTeaching;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 教练视频Service接口
+ *
+ * @author miaxis
+ * @date 2023-02-20
+ */
+public interface IVideoTeachingService extends IService<VideoTeaching>{
+    /**
+     * 查询教练视频列表
+     *
+     * @param videoTeaching 教练视频
+     * @return 教练视频集合
+     */
+    public List<VideoTeaching> selectVideoTeachingList(VideoTeaching videoTeaching);
+}

nbjk-service/src/main/java/com/miaxis/video/service/impl/VideoTeachingServiceImpl.java

@@ -0,0 +1,36 @@
+package com.miaxis.video.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.miaxis.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.apache.commons.lang3.StringUtils;
+import com.miaxis.video.mapper.VideoTeachingMapper;
+import com.miaxis.video.domain.VideoTeaching;
+import com.miaxis.video.service.IVideoTeachingService;
+
+/**
+ * 教练视频Service业务层处理
+ *
+ * @author miaxis
+ * @date 2023-02-20
+ */
+@Service
+public class VideoTeachingServiceImpl extends ServiceImpl<VideoTeachingMapper, VideoTeaching> implements IVideoTeachingService {
+    @Autowired
+    private VideoTeachingMapper videoTeachingMapper;
+
+    /**
+     * 查询教练视频列表
+     *
+     * @param videoTeaching 教练视频
+     * @return 教练视频
+     */
+    @Override
+    public List<VideoTeaching> selectVideoTeachingList(VideoTeaching videoTeaching){
+        return videoTeachingMapper.selectVideoTeachingList(videoTeaching);
+    }
+}

nbjk-service/src/main/resources/mapper/video/VideoTeachingMapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miaxis.video.mapper.VideoTeachingMapper">
+
+    <resultMap type="VideoTeaching" id="VideoTeachingResult">
+        <result property="id"    column="id"    />
+        <result property="videoName"    column="video_name"    />
+        <result property="videoCover"    column="video_cover"    />
+        <result property="videoUrl"    column="video_url"    />
+        <result property="videoSubject"    column="video_subject"    />
+        <result property="state"    column="state"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectVideoTeachingVo">
+        select * from video_teaching
+    </sql>
+
+    <select id="selectVideoTeachingList" parameterType="VideoTeaching" resultMap="VideoTeachingResult">
+        <include refid="selectVideoTeachingVo"/>
+        <where>
+            <if test="videoName != null  and videoName != ''"> and video_name like concat('%', #{videoName}, '%')</if>
+            <if test="videoCover != null  and videoCover != ''"> and video_cover = #{videoCover}</if>
+            <if test="videoUrl != null  and videoUrl != ''"> and video_url = #{videoUrl}</if>
+            <if test="videoSubject != null "> and video_subject = #{videoSubject}</if>
+            <if test="state != null "> and state = #{state}</if>
+        </where>
+    </select>
+
+</mapper>