Merge branch 'master' of http://47.114.101.16:7070/ssy/newcpms

master/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -18,6 +18,8 @@ import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
 import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl;
 import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
 
+import javax.annotation.Resource;
+
 /**
  * spring security配置
  *
@@ -29,7 +31,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
     /**
      * 自定义用户认证逻辑
      */
-    @Autowired
+    @Resource
     private UserDetailsService userDetailsService;
 
     /**
@@ -124,6 +126,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/ehs/approvedanger/processImg/**").anonymous()
                 .antMatchers("/sems/historyYlrq/exportPDFForYear").anonymous()
                 .antMatchers("/sems/historyYlgd/exportPDFForYear").anonymous()
+                .antMatchers("/invoice/bookingworkticket/word").anonymous()
+
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()

master/src/main/java/com/ruoyi/project/invoice/controller/TInvoiceBookingworkticketController.java

@@ -21,6 +21,7 @@ import com.ruoyi.project.invoice.domain.TInvoiceWorkcontent;
 import com.ruoyi.project.invoice.service.ITInvoiceContractorService;
 import com.ruoyi.project.invoice.service.ITInvoiceWorkcontentService;
 import io.jsonwebtoken.lang.Assert;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -176,6 +177,14 @@ public class TInvoiceBookingworkticketController extends BaseController
         return toAjax(tInvoiceBookingworkticketService.deleteTInvoiceBookingworkticketByIds(ids));
     }
 
+    @GetMapping("/word")
+    public AjaxResult Preview () throws IOException {
+        TInvoiceBookingworkticket invoiceBookingworkticket = new TInvoiceBookingworkticket();
+        invoiceBookingworkticket.setContact("测试");
+        String url = this.createBookingworkticketWord(invoiceBookingworkticket);
+        return AjaxResult.success(url);
+    }
+
     /**
      * 生成word
      */
@@ -184,7 +193,7 @@ public class TInvoiceBookingworkticketController extends BaseController
         //渲染文本
         Map<String, Object> params = getWordData(invoiceBookingworkticket);
         // 模板路径
-        String templatePath = "static/word/invice/book.docx";
+        String templatePath = "static/word/invoice/book.docx";
         // 生成word的路径
         String fileDir = RuoYiConfig.getProfile() + "/"+ "ticketWord";
         // 生成word的文件