Merge remote-tracking branch 'origin/master'

base-fast/src/main/java/com/boge/common/utils/R.java

@@ -44,7 +44,6 @@ public class R extends HashMap<String, Object> {
 	public static R ok(String msg) {
 		R r = new R();
 		r.put("msg", msg);
-		r.put("code", 200);
 		return r;
 	}
 

base-fast/src/main/java/com/boge/modules/flow/controller/FlwDeModelController.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.boge.common.utils.ShiroUtils;
 import com.boge.modules.sys.entity.SysUserEntity;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -34,6 +35,7 @@ import com.boge.common.utils.R;
 @RequestMapping("flow/flwdemodel")
 public class FlwDeModelController {
     @Autowired
+    @Lazy
     private FlwDeModelService flwDeModelService;
 
     /**

base-fast/src/main/java/com/boge/modules/flow/controller/FlwDeployController.java

@@ -5,6 +5,7 @@ import com.boge.common.utils.PageUtils;
 import com.boge.common.utils.R;
 import com.boge.modules.flow.service.FlwDeployService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,6 +24,7 @@ import java.util.Map;
 public class FlwDeployController {
 
     @Autowired
+    @Lazy
     private FlwDeployService deployService;
 
     @RequestMapping("/list")

base-fast/src/main/java/com/boge/modules/flow/controller/FlwInstanceController.java

@@ -9,6 +9,7 @@ import com.boge.modules.flow.entity.FlwHiTaskEntity;
 import com.boge.modules.flow.service.FlwInstanceService;
 import com.boge.modules.sys.entity.SysUserEntity;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -19,6 +20,7 @@ import java.util.Map;
 public class FlwInstanceController {
 
     @Autowired
+    @Lazy
     private FlwInstanceService instanceService;
 
     /**

base-fast/src/main/java/com/boge/modules/flow/service/impl/FlwInstanceServiceImpl.java

@@ -148,15 +148,16 @@ public class FlwInstanceServiceImpl extends FlowServiceNoFactory implements FlwI
         String url = CREATE_SESSION_URL + ACCESS_TOKEN;
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("touser", toUser);
-        jsonObject.put("msgtype", "text");
+        jsonObject.put("msgtype", "textcard");
         jsonObject.put("agentid", 1000006);
         JSONObject contentJSon = new JSONObject();
-        contentJSon.put("content", content);
-        jsonObject.put("text", contentJSon);
-        jsonObject.put("safe", 0);
-
-
+        contentJSon.put("title", "新审批待处理");
+        contentJSon.put("description", "点击查看详情");
+        contentJSon.put("url", "http://localhost:8001/#/tickets-tickets");
+        contentJSon.put("btntxt", "处理");
 
+        jsonObject.put("textcard", contentJSon);
+        jsonObject.put("safe", 0);
         try {
             URL postUrl = new URL(url);
             HttpURLConnection http = (HttpURLConnection) postUrl.openConnection();