夏文涛 3 tahun lalu
induk
melakukan
8a1bd51808

+ 45 - 45
.idea/workspace.xml

@@ -2,9 +2,8 @@
 <project version="4">
 <project version="4">
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
     <list default="true" id="33456f28-da03-4d10-99dd-fd9bd193cf84" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-prod.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
     </list>
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -20,28 +19,28 @@
   <component name="FileEditorManager">
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="356">
-              <caret line="40" column="5" selection-start-line="40" selection-start-column="5" selection-end-line="40" selection-end-column="5" />
+            <state relative-caret-position="46">
+              <caret line="2" column="2" selection-start-line="2" selection-start-column="2" selection-end-line="3" selection-end-column="27" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
       <file pinned="false" current-in-tab="false">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="46">
-              <caret line="2" column="2" selection-start-line="2" selection-start-column="2" selection-end-line="3" selection-end-column="27" />
+            <state relative-caret-position="23">
+              <caret line="4" selection-start-line="4" selection-end-line="4" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
       <file pinned="false" current-in-tab="true">
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
+        <entry file="file://$PROJECT_DIR$/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="92">
-              <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
+            <state relative-caret-position="230">
+              <caret line="10" column="25" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="25" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
@@ -182,7 +181,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/utils/AesUtils.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/utils/AesUtils.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmsCodeServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/SmsCodeServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/utils/paramUtils.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/utils/paramUtils.java" />
-        <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/RepairAdmin.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/RepairAdmin.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/LoginController.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/result/ResponseStatusEnum.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/result/ResponseStatusEnum.java" />
@@ -195,6 +193,7 @@
         <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
         <option value="$PROJECT_DIR$/src/main/resources/application-prod.yml" />
         <option value="$PROJECT_DIR$/src/main/resources/application-prod.yml" />
         <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
         <option value="$PROJECT_DIR$/src/main/resources/application-dev.yml" />
+        <option value="$PROJECT_DIR$/pom.xml" />
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
@@ -236,8 +235,6 @@
       <foldersAlwaysOnTop value="true" />
       <foldersAlwaysOnTop value="true" />
     </navigator>
     </navigator>
     <panes>
     <panes>
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
       <pane id="ProjectPane">
         <subPane>
         <subPane>
           <expand>
           <expand>
@@ -440,6 +437,8 @@
           <select />
           <select />
         </subPane>
         </subPane>
       </pane>
       </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
     </panes>
   </component>
   </component>
   <component name="PropertiesComponent">
   <component name="PropertiesComponent">
@@ -449,7 +448,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../报修系统/BackRepairSystem" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="File.Encoding" />
     <property name="settings.editor.selected.configurable" value="File.Encoding" />
@@ -525,12 +524,13 @@
       <workItem from="1688603141902" duration="785000" />
       <workItem from="1688603141902" duration="785000" />
       <workItem from="1688609508818" duration="438000" />
       <workItem from="1688609508818" duration="438000" />
       <workItem from="1688609969175" duration="58000" />
       <workItem from="1688609969175" duration="58000" />
-      <workItem from="1688610441881" duration="100000" />
+      <workItem from="1688610441881" duration="151000" />
+      <workItem from="1688610829222" duration="96000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="29209000" />
+    <option name="totallyTimeSpent" value="29356000" />
   </component>
   </component>
   <component name="TodoView">
   <component name="TodoView">
     <todo-panel id="selected-file">
     <todo-panel id="selected-file">
@@ -542,10 +542,10 @@
     </todo-panel>
     </todo-panel>
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
+    <frame x="953" y="0" width="974" height="1039" extended-state="0" />
     <editor active="true" />
     <editor active="true" />
     <layout>
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21002132" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.4354486" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -750,13 +750,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="93">
-          <caret line="38" selection-start-line="19" selection-start-column="17" selection-end-line="38" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/lang/Exception.java">
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_181/src.zip!/java/lang/Exception.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
         <state relative-caret-position="105">
@@ -961,6 +954,27 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="483">
+          <caret line="40" column="5" selection-start-line="40" selection-start-column="5" selection-end-line="40" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="46">
+          <caret line="2" column="2" selection-start-line="2" selection-start-column="2" selection-end-line="3" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="92">
+          <caret line="4" selection-start-line="4" selection-end-line="4" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/result/ResponseStatusEnum.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/result/ResponseStatusEnum.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="299">
         <state relative-caret-position="299">
@@ -1006,31 +1020,17 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/common/exception/EmsExceptionHandler.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="356">
-          <caret line="40" column="5" selection-start-line="40" selection-start-column="5" selection-end-line="40" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="46">
-          <caret line="2" column="2" selection-start-line="2" selection-start-column="2" selection-end-line="3" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application-prod.yml">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
+        <state relative-caret-position="23">
           <caret line="4" selection-start-line="4" selection-end-line="4" />
           <caret line="4" selection-start-line="4" selection-end-line="4" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application-dev.yml">
+    <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
+        <state relative-caret-position="230">
+          <caret line="10" column="25" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="25" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>

+ 1 - 1
pom.xml

@@ -8,7 +8,7 @@
         <version>2.4.0</version>
         <version>2.4.0</version>
         <relativePath/> <!-- lookup parent from repository -->
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     </parent>
-    <groupId>com.video</groupId>
+    <groupId>com.template</groupId>
     <artifactId>mybatis_plus</artifactId>
     <artifactId>mybatis_plus</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <version>0.0.1-SNAPSHOT</version>
     <name>mybatis_plus</name>
     <name>mybatis_plus</name>

+ 1 - 1
src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@ server:
   port: 8080
   port: 8080
   servlet:
   servlet:
     context-path: /template
     context-path: /template
-    
+
 spring:
 spring:
   main:
   main:
     allow-circular-references: true
     allow-circular-references: true

+ 4 - 1
target/classes/application-dev.yml

@@ -1,5 +1,8 @@
 server:
 server:
   port: 8080
   port: 8080
+  servlet:
+    context-path: /template
+
 spring:
 spring:
   main:
   main:
     allow-circular-references: true
     allow-circular-references: true
@@ -27,7 +30,7 @@ spring:
         min-idle: 100
         min-idle: 100
         max-wait: 60000s
         max-wait: 60000s
 mybatis-plus:
 mybatis-plus:
-  mapper-locations: classpath:/mapper/video/*.xml
+  mapper-locations: classpath:/mapper/template/*.xml
 #  configuration:
 #  configuration:
 #    #开启sql打印
 #    #开启sql打印
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

+ 4 - 1
target/classes/application-prod.yml

@@ -1,5 +1,8 @@
 server:
 server:
   port: 8080
   port: 8080
+  servlet:
+    context-path: /template
+
 spring:
 spring:
   main:
   main:
     allow-circular-references: true
     allow-circular-references: true
@@ -28,7 +31,7 @@ spring:
         max-wait: 60000s
         max-wait: 60000s
   # \u914D\u7F6E\u65E5\u5FD7
   # \u914D\u7F6E\u65E5\u5FD7
 mybatis-plus:
 mybatis-plus:
-  mapper-locations: classpath:/mapper/video/*.xml
+  mapper-locations: classpath:/mapper/template/*.xml
 #  configuration:
 #  configuration:
 #    #开启sql打印
 #    #开启sql打印
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

+ 4 - 1
target/classes/application.yml

@@ -1,5 +1,8 @@
 server:
 server:
   port: 8080
   port: 8080
+  servlet:
+    context-path: /template
+
 spring:
 spring:
   profiles:
   profiles:
       active: dev
       active: dev
@@ -31,7 +34,7 @@ spring:
         max-wait: 60000s
         max-wait: 60000s
 # mybatis-plus不属于spring
 # mybatis-plus不属于spring
 mybatis-plus:
 mybatis-plus:
-  mapper-locations: classpath:/mapper/video/*.xml
+  mapper-locations: classpath:/mapper/template/*.xml
   global-config:
   global-config:
     db-config:
     db-config:
       logic-delete-value: 1
       logic-delete-value: 1

TEMPAT SAMPAH
target/classes/com/template/common/exception/EmsExceptionHandler.class


+ 1 - 1
target/maven-archiver/pom.properties

@@ -1,3 +1,3 @@
 artifactId=mybatis_plus
 artifactId=mybatis_plus
-groupId=com.video
+groupId=com.template
 version=0.0.1-SNAPSHOT
 version=0.0.1-SNAPSHOT

TEMPAT SAMPAH
target/mybatis_plus-0.0.1-SNAPSHOT.jar


TEMPAT SAMPAH
target/mybatis_plus-0.0.1-SNAPSHOT.jar.original


File diff ditekan karena terlalu besar
+ 0 - 66
target/surefire-reports/TEST-com.template.MybatisPlusApplicationTests.xml


File diff ditekan karena terlalu besar
+ 0 - 66
target/surefire-reports/TEST-com.template.WrapperTest.xml


+ 0 - 4
target/surefire-reports/com.template.MybatisPlusApplicationTests.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: com.template.MybatisPlusApplicationTests
--------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.417 s - in com.template.MybatisPlusApplicationTests

+ 0 - 4
target/surefire-reports/com.template.WrapperTest.txt

@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: com.template.WrapperTest
--------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.015 s - in com.template.WrapperTest