首行缩进去掉

.idea/workspace.xml

@@ -3,9 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="7f042d7d-b621-4a07-8bfd-3e8d4f7f1687" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/project_image_synthesis.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/project_image_synthesis.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/springboot-function/src/main/java/com/xmnk/springbootfunction/service/impl/TemplateServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/springboot-function/src/main/java/com/xmnk/springbootfunction/service/impl/TemplateServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/springboot-function/target/classes/com/xmnk/springbootfunction/service/impl/TemplateServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/springboot-function/target/classes/com/xmnk/springbootfunction/service/impl/TemplateServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/springboot-function/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/springboot-function/src/main/resources/application.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -155,7 +153,7 @@
       <workItem from="1688105941639" duration="40659000" />
       <workItem from="1688200043275" duration="2963000" />
       <workItem from="1688203851804" duration="6020000" />
-      <workItem from="1688346173572" duration="3264000" />
+      <workItem from="1688346173572" duration="4014000" />
     </task>
     <task id="LOCAL-00001" summary="first">
       <created>1688011457362</created>
@@ -262,7 +260,14 @@
       <option name="project" value="LOCAL" />
       <updated>1688209899146</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="换行修改">
+      <created>1688349732490</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1688349732490</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -307,10 +312,10 @@
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state x="2635" y="222" key="#xdebugger.evaluate/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688122971764" />
-    <state x="2377" y="112" key="CommitChangelistDialog2" timestamp="1688209895630">
+    <state x="2377" y="112" key="CommitChangelistDialog2" timestamp="1688349727629">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state x="2377" y="112" key="CommitChangelistDialog2/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688209895630" />
+    <state x="2377" y="112" key="CommitChangelistDialog2/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688349727629" />
     <state width="1188" height="466" key="DebuggerActiveHint" timestamp="1688208590357">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
@@ -319,75 +324,75 @@
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state x="2660" y="275" key="FileChooserDialogImpl/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688010935519" />
-    <state width="1877" height="425" key="GridCell.Tab.0.bottom" timestamp="1688349677858">
+    <state width="1877" height="425" key="GridCell.Tab.0.bottom" timestamp="1688350712642">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="380" key="GridCell.Tab.0.bottom/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1687137042765" />
-    <state width="1877" height="425" key="GridCell.Tab.0.bottom/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688349677858" />
-    <state width="1877" height="425" key="GridCell.Tab.0.center" timestamp="1688349677857">
+    <state width="1877" height="425" key="GridCell.Tab.0.bottom/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688350712642" />
+    <state width="1877" height="425" key="GridCell.Tab.0.center" timestamp="1688350712642">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="380" key="GridCell.Tab.0.center/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1687137042765" />
-    <state width="1877" height="425" key="GridCell.Tab.0.center/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688349677857" />
-    <state width="1877" height="425" key="GridCell.Tab.0.left" timestamp="1688349677857">
+    <state width="1877" height="425" key="GridCell.Tab.0.center/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688350712642" />
+    <state width="1877" height="425" key="GridCell.Tab.0.left" timestamp="1688350712642">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="380" key="GridCell.Tab.0.left/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1687137042765" />
-    <state width="1877" height="425" key="GridCell.Tab.0.left/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688349677857" />
-    <state width="1877" height="425" key="GridCell.Tab.0.right" timestamp="1688349677857">
+    <state width="1877" height="425" key="GridCell.Tab.0.left/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688350712642" />
+    <state width="1877" height="425" key="GridCell.Tab.0.right" timestamp="1688350712642">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="380" key="GridCell.Tab.0.right/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1687137042765" />
-    <state width="1877" height="425" key="GridCell.Tab.0.right/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688349677857" />
-    <state width="1877" height="171" key="GridCell.Tab.1.bottom" timestamp="1688349600308">
+    <state width="1877" height="425" key="GridCell.Tab.0.right/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688350712642" />
+    <state width="1877" height="171" key="GridCell.Tab.1.bottom" timestamp="1688350699111">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="380" key="GridCell.Tab.1.bottom/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1687137042766" />
-    <state width="1877" height="171" key="GridCell.Tab.1.bottom/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688349600308" />
-    <state width="1877" height="171" key="GridCell.Tab.1.center" timestamp="1688349600308">
+    <state width="1877" height="171" key="GridCell.Tab.1.bottom/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688350699111" />
+    <state width="1877" height="171" key="GridCell.Tab.1.center" timestamp="1688350699110">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="380" key="GridCell.Tab.1.center/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1687137042765" />
-    <state width="1877" height="171" key="GridCell.Tab.1.center/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688349600308" />
-    <state width="1877" height="171" key="GridCell.Tab.1.left" timestamp="1688349600308">
+    <state width="1877" height="171" key="GridCell.Tab.1.center/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688350699110" />
+    <state width="1877" height="171" key="GridCell.Tab.1.left" timestamp="1688350699110">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="380" key="GridCell.Tab.1.left/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1687137042765" />
-    <state width="1877" height="171" key="GridCell.Tab.1.left/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688349600308" />
-    <state width="1877" height="171" key="GridCell.Tab.1.right" timestamp="1688349600308">
+    <state width="1877" height="171" key="GridCell.Tab.1.left/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688350699110" />
+    <state width="1877" height="171" key="GridCell.Tab.1.right" timestamp="1688350699111">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="380" key="GridCell.Tab.1.right/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1687137042765" />
-    <state width="1877" height="171" key="GridCell.Tab.1.right/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688349600308" />
-    <state width="1877" height="171" key="GridCell.Tab.2.bottom" timestamp="1688349600309">
+    <state width="1877" height="171" key="GridCell.Tab.1.right/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688350699111" />
+    <state width="1877" height="171" key="GridCell.Tab.2.bottom" timestamp="1688350699111">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="380" key="GridCell.Tab.2.bottom/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1687137042767" />
-    <state width="1877" height="171" key="GridCell.Tab.2.bottom/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688349600309" />
-    <state width="1877" height="171" key="GridCell.Tab.2.center" timestamp="1688349600308">
+    <state width="1877" height="171" key="GridCell.Tab.2.bottom/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688350699111" />
+    <state width="1877" height="171" key="GridCell.Tab.2.center" timestamp="1688350699111">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="380" key="GridCell.Tab.2.center/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1687137042766" />
-    <state width="1877" height="171" key="GridCell.Tab.2.center/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688349600308" />
-    <state width="1877" height="171" key="GridCell.Tab.2.left" timestamp="1688349600308">
+    <state width="1877" height="171" key="GridCell.Tab.2.center/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688350699111" />
+    <state width="1877" height="171" key="GridCell.Tab.2.left" timestamp="1688350699111">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="380" key="GridCell.Tab.2.left/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1687137042766" />
-    <state width="1877" height="171" key="GridCell.Tab.2.left/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688349600308" />
-    <state width="1877" height="171" key="GridCell.Tab.2.right" timestamp="1688349600309">
+    <state width="1877" height="171" key="GridCell.Tab.2.left/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688350699111" />
+    <state width="1877" height="171" key="GridCell.Tab.2.right" timestamp="1688350699111">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state width="1877" height="380" key="GridCell.Tab.2.right/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1687137042767" />
-    <state width="1877" height="171" key="GridCell.Tab.2.right/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688349600309" />
+    <state width="1877" height="171" key="GridCell.Tab.2.right/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688350699111" />
     <state x="2381" y="162" key="SettingsEditor" timestamp="1688011350889">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
     <state x="461" y="162" key="SettingsEditor/1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1687136970053" />
     <state x="2381" y="162" key="SettingsEditor/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688011350889" />
-    <state x="2472" y="253" key="Vcs.Push.Dialog.v2" timestamp="1688209906545">
+    <state x="2472" y="253" key="Vcs.Push.Dialog.v2" timestamp="1688349743005">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>
-    <state x="2472" y="253" key="Vcs.Push.Dialog.v2/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688209906545" />
+    <state x="2472" y="253" key="Vcs.Push.Dialog.v2/1920.0.1920.1040/0.0.1920.1040@1920.0.1920.1040" timestamp="1688349743005" />
     <state x="2560" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1688200042896">
       <screen x="1920" y="0" width="1920" height="1040" />
     </state>

logs/project_image_synthesis.log

@@ -536,3 +536,44 @@ java.lang.StringIndexOutOfBoundsException: String index out of range: 60
 2023-07-03 09:59:41.894  INFO 11288 --- [Thread-11] c.b.d.d.DynamicRoutingDataSource         : closing dynamicDatasource  ing....
 2023-07-03 09:59:41.895  INFO 11288 --- [Thread-11] com.zaxxer.hikari.HikariDataSource       : master - Shutdown initiated...
 2023-07-03 09:59:41.898  INFO 11288 --- [Thread-11] com.zaxxer.hikari.HikariDataSource       : master - Shutdown completed.
+2023-07-03 10:03:10.221  INFO 7228 --- [main] c.x.s.SpringbootFunctionApplication      : Starting SpringbootFunctionApplication on DESKTOP-46UE442 with PID 7228 (E:\java\YaoXiangMu\springboot-parent\springboot-function\target\classes started by admin in E:\java\YaoXiangMu\springboot-parent)
+2023-07-03 10:03:10.225  INFO 7228 --- [main] c.x.s.SpringbootFunctionApplication      : The following profiles are active: dev
+2023-07-03 10:03:10.944  INFO 7228 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2023-07-03 10:03:10.946  INFO 7228 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data repositories in DEFAULT mode.
+2023-07-03 10:03:10.982  INFO 7228 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 25ms. Found 0 repository interfaces.
+2023-07-03 10:03:11.055  WARN 7228 --- [main] o.m.s.mapper.ClassPathMapperScanner      : No MyBatis mapper was found in '[com.xmnk.springbootfunction]' package. Please check your configuration.
+2023-07-03 10:03:11.315  INFO 7228 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'spring.datasource.dynamic-com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-07-03 10:03:11.318  INFO 7228 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration' of type [com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration$$EnhancerBySpringCGLIB$$af958dd2] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-07-03 10:03:11.323  INFO 7228 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'dsProcessor' of type [com.baomidou.dynamic.datasource.processor.DsHeaderProcessor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-07-03 10:03:11.327  INFO 7228 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'dynamicDatasourceAnnotationAdvisor' of type [com.baomidou.dynamic.datasource.aop.DynamicDataSourceAnnotationAdvisor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-07-03 10:03:11.336  INFO 7228 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$46071d01] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-07-03 10:03:11.346  INFO 7228 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'shiroConfig' of type [com.xmnk.springbootfunction.shiro.ShiroConfig$$EnhancerBySpringCGLIB$$bb89da14] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-07-03 10:03:11.612  INFO 7228 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'customHashedCredentialsMatcher' of type [com.xmnk.springbootfunction.shiro.CustomHashedCredentialsMatcher] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-07-03 10:03:11.629  INFO 7228 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'customRealm' of type [com.xmnk.springbootfunction.shiro.CustomRealm] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-07-03 10:03:11.636  INFO 7228 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'securityManager' of type [org.apache.shiro.web.mgt.DefaultWebSecurityManager] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-07-03 10:03:11.647  INFO 7228 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'authorizationAttributeSourceAdvisor' of type [org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2023-07-03 10:03:11.984  INFO 7228 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 10015 (http)
+2023-07-03 10:03:12.005  INFO 7228 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2023-07-03 10:03:12.005  INFO 7228 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.21]
+2023-07-03 10:03:12.097  INFO 7228 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2023-07-03 10:03:12.097  INFO 7228 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 1786 ms
+2023-07-03 10:03:12.277  INFO 7228 --- [main] com.zaxxer.hikari.HikariDataSource       : master - Starting...
+2023-07-03 10:03:12.376  INFO 7228 --- [main] com.zaxxer.hikari.HikariDataSource       : master - Start completed.
+2023-07-03 10:03:12.376  INFO 7228 --- [main] c.b.d.d.DynamicRoutingDataSource         : 初始共加载 1 个数据源
+2023-07-03 10:03:12.376  INFO 7228 --- [main] c.b.d.d.DynamicRoutingDataSource         : 动态数据源-加载 master 成功
+2023-07-03 10:03:12.376  INFO 7228 --- [main] c.b.d.d.DynamicRoutingDataSource         : 当前的默认数据源是单数据源，数据源名为 master
+2023-07-03 10:03:13.734  INFO 7228 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
+2023-07-03 10:03:14.121  INFO 7228 --- [main] o.s.s.c.ThreadPoolTaskScheduler          : Initializing ExecutorService 'taskScheduler'
+2023-07-03 10:03:14.238  INFO 7228 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 10015 (http) with context path ''
+2023-07-03 10:03:14.241  INFO 7228 --- [main] c.x.s.SpringbootFunctionApplication      : Started SpringbootFunctionApplication in 4.525 seconds (JVM running for 5.306)
+2023-07-03 10:03:14.243  INFO 7228 --- [main] c.x.s.SpringbootFunctionApplication      : 
+----------------------------------------------------------
+	Application 'imageSynthesis' is running! ----------------------------------------------------------
+2023-07-03 10:04:28.335  INFO 7228 --- [http-nio-10015-exec-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2023-07-03 10:04:28.336  INFO 7228 --- [http-nio-10015-exec-1] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2023-07-03 10:04:28.345  INFO 7228 --- [http-nio-10015-exec-1] o.s.web.servlet.DispatcherServlet        : Completed initialization in 9 ms
+2023-07-03 10:18:17.377  INFO 7228 --- [Thread-11] o.s.s.c.ThreadPoolTaskScheduler          : Shutting down ExecutorService 'taskScheduler'
+2023-07-03 10:18:17.379  INFO 7228 --- [Thread-11] o.s.s.concurrent.ThreadPoolTaskExecutor  : Shutting down ExecutorService 'applicationTaskExecutor'
+2023-07-03 10:18:17.392  INFO 7228 --- [Thread-11] c.b.d.d.DynamicRoutingDataSource         : closing dynamicDatasource  ing....
+2023-07-03 10:18:17.393  INFO 7228 --- [Thread-11] com.zaxxer.hikari.HikariDataSource       : master - Shutdown initiated...
+2023-07-03 10:18:17.401  INFO 7228 --- [Thread-11] com.zaxxer.hikari.HikariDataSource       : master - Shutdown completed.

springboot-function/src/main/java/com/xmnk/springbootfunction/service/impl/TemplateServiceImpl.java

@@ -288,7 +288,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, Template> i
                         int y_i = y + num * lineHeight1 + lineHeight1 * (j + 1);
 
                         if (row == 1) {
-                            g.drawString(contentTemp1, x_i + wordWidth * 2, y_i);
+                            g.drawString(contentTemp1, x_i, y_i);
                         } else {
                             g.drawString(contentTemp1, x_i, y_i);
                         }
@@ -307,7 +307,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, Template> i
 //                            int y_i = y + num * lineHeight1 + lineHeight1 * (j + 1);
 //
 //                            if (row == 1) {
-//                                g.drawString(contentTemp1, x_i + wordWidth * 2, y_i);
+//                                g.drawString(contentTemp1, x_i, y_i);
 //                            } else {
 //                                g.drawString(contentTemp1, x_i, y_i);
 //                            }
@@ -326,7 +326,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, Template> i
 //                            int y_i = y + num * lineHeight1 + lineHeight1 * (j + 1);
 //
 //                            if (row == 1) {
-//                                g.drawString(contentTemp1, x_i + wordWidth * 2, y_i);
+//                                g.drawString(contentTemp1, x_i, y_i);
 //                            } else {
 //                                g.drawString(contentTemp1, x_i, y_i);
 //                            }
@@ -579,7 +579,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, Template> i
                         int y_i = y + num * lineHeight1 + lineHeight1 * (j + 1);
 
                         if (row == 1) {
-                            g.drawString(contentTemp1, x_i + wordWidth * 2, y_i);
+                            g.drawString(contentTemp1, x_i, y_i);
                         } else {
                             g.drawString(contentTemp1, x_i, y_i);
                         }
@@ -598,7 +598,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, Template> i
 //                            int y_i = y + num * lineHeight1 + lineHeight1 * (j + 1);
 //
 //                            if (row == 1) {
-//                                g.drawString(contentTemp1, x_i + wordWidth * 2, y_i);
+//                                g.drawString(contentTemp1, x_i, y_i);
 //                            } else {
 //                                g.drawString(contentTemp1, x_i, y_i);
 //                            }
@@ -617,7 +617,7 @@ public class TemplateServiceImpl extends ServiceImpl<TemplateMapper, Template> i
 //                            int y_i = y + num * lineHeight1 + lineHeight1 * (j + 1);
 //
 //                            if (row == 1) {
-//                                g.drawString(contentTemp1, x_i + wordWidth * 2, y_i);
+//                                g.drawString(contentTemp1, x_i, y_i);
 //                            } else {
 //                                g.drawString(contentTemp1, x_i, y_i);
 //                            }