冲突

signin/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: prod
+    include: util-prod,common
 

util/src/main/java/com/ccsens/util/CodeError.java

@@ -23,6 +23,30 @@ public class CodeError {
             this.success = success;
         }
 
+
+        public Code addMsg(String msg){
+            if(this.msg.contains("错误:")){
+                this.msg = this.msg.substring(this.msg.indexOf("错误:") + 3);
+            }
+            this.msg = msg+"--错误:"+this.msg;
+            return this;
+        }
+
+        public Code addMsg(String sheetName,Integer rowNum){
+            if(this.msg.contains("错误:")){
+                this.msg = this.msg.substring(this.msg.indexOf("错误:") + 3);
+            }
+            this.msg = sheetName+"第"+rowNum+"行--错误:"+this.msg;
+            return this;
+        }
+
+        public Code addMsg(String sheetName,Integer rowNum,String value){
+            if(this.msg.contains("错误:")){
+                this.msg = this.msg.substring(this.msg.indexOf("错误:") + 3);
+            }
+            this.msg = sheetName+"第"+rowNum+"行["+value+"]--错误:"+this.msg;
+            return this;
+        }
     }
 
 }