Merge remote-tracking branch 'origin/master'

admin

2019-01-28 f7ed4e6bbe9be95d268481e66d70d90e70e07e12

 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java

@@ -6,8 +6,6 @@
import java.util.List;



import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;



import net.sf.json.JSONObject;



@@ -23,8 +21,8 @@
import com.yeshi.fanli.entity.bus.homemodule.Special;

import com.yeshi.fanli.entity.bus.homemodule.SpecialCard;

import com.yeshi.fanli.entity.bus.homemodule.SuperSpecialCard;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.entity.common.JumpDetailV2;

import com.yeshi.fanli.entity.system.System;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.config.SystemConfigService;

@@ -35,8 +33,6 @@
import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.annotation.RequestNoLogin;

import com.yeshi.fanli.entity.system.System;



@Controller

@RequestMapping("admin/new/api/v1/specialcard")

@@ -429,7 +425,6 @@
    * @param record

    * @param out

    */

   @RequestNoLogin()

   @RequestMapping(value = "modifySpecial")

   public void modifySpecial(String callback, Special record, String jumpType, PrintWriter out) {

      

@@ -485,20 +480,9 @@
    * @param response

    * @param out

    */

   @RequestNoLogin()

   @RequestMapping(value = "saveSpecial")

   public void saveSpecial(@RequestParam("file") CommonsMultipartFile file, Long uid,

         Long id, Long cardId, HttpServletRequest request, HttpServletResponse response, PrintWriter out) {

		
      response.setHeader("Access-Control-Allow-Origin", "*");

      response.setHeader("Access-Control-Allow-Methods", "*");



      AdminUser admin = adminUserService.selectByPrimaryKey(uid);



      if (admin == null) {

         out.print(JsonUtil.loadFalseResult("当前账户验证失败"));

         return;

      }

   public void saveSpecial(@RequestParam("file") CommonsMultipartFile file, Long id, Long cardId,

         PrintWriter out) {

      

      if (file == null) {

         out.print(JsonUtil.loadFalseResult("上传文件为空"));