会员优化

ruoyi-train/src/main/java/com/ruoyi/train/course/controller/ApiTrainCourseController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.train.course.controller;
 
+import cn.hutool.json.JSONObject;
 import com.ruoyi.common.base.AjaxResult;
 import com.ruoyi.framework.web.base.BaseController;
 import com.ruoyi.train.course.domain.TrainCourse;
@@ -8,7 +9,6 @@ import com.ruoyi.train.course.domain.TrainCourseSection;
 import com.ruoyi.train.course.service.ITrainCourseCategoryService;
 import com.ruoyi.train.course.service.ITrainCourseSectionService;
 import com.ruoyi.train.course.service.ITrainCourseService;
-import net.sf.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -49,12 +49,8 @@ public class ApiTrainCourseController extends BaseController {
 	@GetMapping("/trainCourse/{id}")
 	public AjaxResult get(@PathVariable("id") Integer id) {
 		TrainCourse trainCourse = trainCourseService.selectById( id );
-//		TrainCourseCategory courseCategory = trainCourseCategoryService.selectById( trainCourse.getTrainCourseCategoryId() );
-		JSONObject jsonObject = JSONObject.fromObject( trainCourse );
-//		JSONObject courseCategoryJSON = JSONObject.fromObject( courseCategory );
-//		jsonObject.put( "courseCategory", courseCategory );
 		AjaxResult success = success( "查询成功" );
-		success.put( "data", jsonObject );
+		success.put( "data", trainCourse );
 		return success;
 	}
 

ruoyi-vip/src/main/java/com/ruoyi/vip/controller/ApiVipUserController.java

@@ -16,8 +16,6 @@ import com.ruoyi.framework.web.util.ServletUtils;
 import com.ruoyi.framework.web.util.ShiroUtils;
 import com.ruoyi.system.domain.SysUser;
 import com.ruoyi.system.service.ISysUserService;
-import com.ruoyi.vip.domain.VipUser;
-import com.ruoyi.vip.service.IVipUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.SecurityUtils;

ruoyi-vip/src/main/resources/templates/vip/user/add.html

@@ -75,7 +75,7 @@
         			minlength: 2,
         			maxlength: 20,
         			remote: {
-                        url: ctx + "system/user/checkLoginNameUnique",
+                        url: ctx + "vip/user/checkLoginNameUnique",
                         type: "post",
                         dataType: "json",
                         data: {
@@ -103,7 +103,7 @@
         			required:true,
                     email:true,
                     remote: {
-                        url: ctx + "system/user/checkEmailUnique",
+                        url: ctx + "vip/user/checkEmailUnique",
                         type: "post",
                         dataType: "json",
                         data: {
@@ -120,7 +120,7 @@
         			required:true,
         			isPhone:true,
                     remote: {
-                        url: ctx + "system/user/checkPhoneUnique",
+                        url: ctx + "vip/user/checkPhoneUnique",
                         type: "post",
                         dataType: "json",
                         data: {
@@ -168,7 +168,7 @@
         	$.ajax({
         		cache : true,
         		type : "POST",
-        		url : ctx + "system/user/add",
+        		url : ctx + "vip/user/add",
         		data : {
         			"userId": userId,
         			"deptId": deptId,

ruoyi-vip/src/main/resources/templates/vip/user/edit.html

@@ -74,7 +74,7 @@
         			required:true,
                     email:true,
                     remote: {
-                        url: ctx + "system/user/checkEmailUnique",
+                        url: ctx + "vip/user/checkEmailUnique",
                         type: "post",
                         dataType: "json",
                         data: {
@@ -94,7 +94,7 @@
         			required:true,
         			isPhone:true,
                     remote: {
-                        url: ctx + "system/user/checkPhoneUnique",
+                        url: ctx + "vip/user/checkPhoneUnique",
                         type: "post",
                         dataType: "json",
                         data: {
@@ -143,7 +143,7 @@
         	$.ajax({
         		cache : true,
         		type : "POST",
-        		url : ctx + "system/user/edit",
+        		url : ctx + "vip/user/edit",
         		data : {
         			"userId": userId,
         			"deptId": deptId,

ruoyi-vip/src/main/resources/templates/vip/user/resetPwd.html

@@ -34,7 +34,7 @@
 		
 		function submitHandler() {
 	        if ($.validate.form()) {
-	        	$.operate.save(ctx + "system/user/resetPwd", $('#form-user-resetPwd').serialize());
+	        	$.operate.save(ctx + "vip/user/resetPwd", $('#form-user-resetPwd').serialize());
 	        }
 	    }
 	</script>

ruoyi-vip/src/main/resources/templates/vip/user/user.html

@@ -93,7 +93,7 @@
 		var removeFlag = [[${@permission.hasPermi('system:user:remove')}]];
 		var resetPwdFlag = [[${@permission.hasPermi('system:user:resetPwd')}]];
 		var datas = [[${@dict.getType('sys_normal_disable')}]];
-		var prefix = ctx + "system/user";
+		var prefix = ctx + "vip/user";
 
 		$(function() {
 			$('body').layout({ west__size: 185 });