Merge remote-tracking branch 'origin/dev' into dev

itc-pcitc-demo/itc-pcitc-demo-service/pom.xml

@@ -18,6 +18,8 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <docker-image-name>pcitc/itc-pcitc-demo</docker-image-name>
+        <libServerUrl>http://172.27.46.206:23117</libServerUrl>
+		<ignoreUpload>false</ignoreUpload>
     </properties>
 
     <dependencies>
@@ -81,7 +83,7 @@
     <build>
     	<finalName>app</finalName>
         <plugins>
-            <plugin>
+<!--             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>2.7.6</version>
@@ -91,12 +93,30 @@
                             <goal>repackage</goal>
                         </goals>
                         <configuration>
-                            <!--<classifier>classes</classifier>-->
+                            <classifier>classes</classifier>
                             <attach>false</attach>
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin> -->
+			<plugin>
+					<groupId>com.geg</groupId>
+					<artifactId>tanuki-boot-maven-plugin</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<libServerUrl>${libServerUrl}</libServerUrl>
+						<ignoreUpload>${ignoreUpload}</ignoreUpload>
+						<libServerUser>${libServerUser}</libServerUser>
+						<libServerPwd>${libServerPwd}</libServerPwd>
+					</configuration>
+					<executions>
+						<execution>
+							<goals>
+								<goal>repackage</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/dev/controller/Testfrom3Controller.java

@@ -142,34 +142,17 @@ public class Testfrom3Controller {
 
 	    	@Override
 	    	public UpdateTestfrom3Dto before(DataOperationContent<UpdateTestfrom3Dto> content) {
-	    		if(content.getType()==OperationType.DELETE) {
+	    		
-	    			CommonCallUtils.deleteBefore(content.getTableName(),content.getIdValue());
-	    		}else if(content.getType()==OperationType.DISABLE){
-	    			CommonCallUtils.disableBefore(content.getTableName(),content.getIdValue());
-	    		}else if(content.getType()==OperationType.ENABLE){
-	    			CommonCallUtils.enableBefore(content.getTableName(),content.getIdValue());
-	    		}
 	    		return content.getObj();
 	    	}
 
 	    	@Override
 	    	public UpdateTestfrom3Dto after(DataOperationContent<UpdateTestfrom3Dto> content) {
-	    		if(content.getType()==OperationType.INSERT || content.getType()==OperationType.UPDATE) {
+	    		if(content.getType()==OperationType.UPDATE) {
 	    			CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue());
 	    		}
 	    		return content.getObj();
 	    	}
-
-	    	@Override
-	    	public void onError(DataOperationContent<UpdateTestfrom3Dto> content) {
-	    		// TODO Auto-generated method stub
-	    	}
-
-	    	@Override
-	    	public void onFinally(DataOperationContent<UpdateTestfrom3Dto> content) {
-	    		// TODO Auto-generated method stub
-	    	}
-	    	
 		}));
     }
     

itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/jdbc/JdbcContext.java

@@ -7,13 +7,17 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.List;
+
 import javax.sql.DataSource;
+
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceUtils;
 import org.springframework.jdbc.support.JdbcUtils;
+
 import com.pictc.jdbc.model.JdbcParam;
 import com.pictc.utils.CollectionUtils;
+
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -23,7 +27,7 @@ import lombok.extern.slf4j.Slf4j;
 @Setter
 public class JdbcContext {
 	
-public static final int DEF_STEP = 1000;
+	public static final int DEF_STEP = 1000;
 	
 	private JdbcTemplate jdbc;
 	

itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/jdbc/JdbcTools.java

@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
 import com.pictc.jdbc.model.JdbcParam;
 import com.pictc.jdbc.model.QueryParameter;
 import com.pictc.utils.CollectionUtils;

itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java

@@ -4,10 +4,10 @@ import java.util.List;
 
 import org.springframework.stereotype.Component;
 
+import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
 import com.google.api.client.util.Lists;
 import com.pictc.jdbc.JdbcTools;
 import com.pictc.jdbc.model.JdbcParam;
-import com.pictc.utils.ListUtils;
 import com.pictc.utils.StringUtils;
 
 /**