代码优化

magic-api/src/main/java/org/ssssssss/magicapi/controller/MagicAPIController.java

@@ -13,12 +13,13 @@ import org.ssssssss.magicapi.model.Constants;
 import org.ssssssss.magicapi.model.JsonBean;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
 /**
  * 接口相关操作
+ *
+ * @author mxd
  */
 public class MagicAPIController extends MagicController implements MagicExceptionHandler {
 

magic-api/src/main/java/org/ssssssss/magicapi/controller/MagicWorkbenchController.java

@@ -45,15 +45,17 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+/**
+ * UI上其它相关操作
+ *
+ * @author mxd
+ */
 public class MagicWorkbenchController extends MagicController implements MagicExceptionHandler {
 
 	private static final Logger logger = LoggerFactory.getLogger(MagicWorkbenchController.class);
-
-	private final String secretKey;
-
 	private static final Pattern SINGLE_LINE_COMMENT_TODO = Pattern.compile("((TODO)|(todo)|(fixme)|(FIXME))[ \t]+[^\n]+");
-
 	private static final Pattern MULTI_LINE_COMMENT_TODO = Pattern.compile("((TODO)|(todo)|(fixme)|(FIXME))[ \t]+[^\n(?!*/)]+");
+	private final String secretKey;
 
 	public MagicWorkbenchController(MagicConfiguration configuration, String secretKey) {
 		super(configuration);
@@ -141,7 +143,7 @@ public class MagicWorkbenchController extends MagicController implements MagicEx
 		// 重新注册接口
 		configuration.getMappingHandlerMapping().registerAllMapping();
 		// 重新注册函数
-		configuration.getMagicFunctionManager().registerAllFunction();;
+		configuration.getMagicFunctionManager().registerAllFunction();
 		// 重新注册数据源
 		magicAPIService.registerAllDataSource();
 		// 发送更新通知
@@ -208,8 +210,8 @@ public class MagicWorkbenchController extends MagicController implements MagicEx
 					String text = comment.getText();
 					Pattern pattern = text.startsWith("//") ? SINGLE_LINE_COMMENT_TODO : MULTI_LINE_COMMENT_TODO;
 					Matcher matcher = pattern.matcher(text);
-					while(matcher.find()){
-						result.add(new HashMap<String, Object>(){
+					while (matcher.find()) {
+						result.add(new HashMap<String, Object>() {
 							{
 								put("id", entity.getId());
 								put("text", matcher.group(0).trim());
@@ -272,8 +274,8 @@ public class MagicWorkbenchController extends MagicController implements MagicEx
 	@RequestMapping("/push")
 	@ResponseBody
 	@Valid(authorization = Authorization.PUSH)
-	public JsonBean<?> push(@RequestHeader("magic-push-target") String target, @RequestHeader("magic-push-secret-key")String secretKey,
-							@RequestHeader("magic-push-mode")String mode, @RequestBody List<SelectedResource> resources) {
+	public JsonBean<?> push(@RequestHeader("magic-push-target") String target, @RequestHeader("magic-push-secret-key") String secretKey,
+							@RequestHeader("magic-push-mode") String mode, @RequestBody List<SelectedResource> resources) {
 		return magicAPIService.push(target, secretKey, mode, resources);
 	}
 

magic-editor/src/console/src/components/editor/magic-history.vue

@@ -3,11 +3,11 @@
     <ul class="not-select">
       <li v-for="(item, key) in timestampes" :key="'history_' + key" :class="{ selected: currentItem === item }"
           @click.stop="open(item)">
-        {{ item.dateTime }}
+        {{ item.dateTime }} ({{item.createBy || 'guest'}})
       </li>
     </ul>
     <div class="version">
-      <span class="version-time">{{ currentItem.dateTime }}</span>
+      <span class="version-time">{{ currentItem.dateTime }} ({{ currentItem.createBy || 'guest'}})</span>
       <span class="current">当前版本</span>
     </div>
     <div ref="diffEditor" class="diff-editor"></div>
@@ -106,7 +106,7 @@ export default {
 .ma-history ul {
   position: absolute;
   left: 0px;
-  width: 160px;
+  width: 210px;
   bottom: 5px;
   top: 0px;
   color: var(--color);
@@ -119,6 +119,7 @@ export default {
   height: 20px;
   line-height: 20px;
   padding-left: 5px;
+  white-space: nowrap;
 }
 
 .ma-history ul li:hover,
@@ -129,7 +130,7 @@ export default {
 
 .ma-history .version {
   position: absolute;
-  left: 160px;
+  left: 210px;
   right: 0px;
   line-height: 24px;
   height: 24px;
@@ -147,7 +148,7 @@ export default {
 
 .ma-history .diff-editor {
   position: absolute;
-  left: 160px;
+  left: 210px;
   right: 0px;
   top: 24px;
   bottom: 5px;

magic-editor/src/console/src/components/editor/magic-script-editor.vue

@@ -4,7 +4,7 @@
       <ul ref="scrollbar" class="ma-tab not-select">
         <li
             v-for="(item, index) in scripts"
-            :key="'api_' + item.tmp_id || item.id"
+            :key="'opened_script_' + index"
             :class="{ selected: selected === item, draggableTargetItem: item.ext.tabDraggable }"
             :title="item.displayName || item.name"
             :id="'ma-tab-item-' + item.tmp_id"