2 次代碼提交 f8746a6f30 ... 9628079144

作者 SHA1 備註 提交日期
  yuanzhi_kuang 9628079144 更改 2 月之前
  yuanzhi_kuang c9f978f48d canshu 2 月之前

+ 1 - 1
.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="svn" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

+ 2 - 66
.idea/workspace.xml

@@ -4,33 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="bd79ff4a-d1d3-414f-9bfa-19719146eaa4" name="更改" comment="">
-      <change afterPath="$PROJECT_DIR$/code/opmcepaq/uzi9-uzi9q-opmcepaq-epaq/src/main/java/uzi9/uzi9q/opmcepaq/epaq/plugin/form/activities" afterDir="true" />
-      <change afterPath="$PROJECT_DIR$/code/opmcepaq/uzi9-uzi9q-opmcepaq-epaq/src/main/java/uzi9/uzi9q/opmcepaq/epaq/plugin/form/activities/DynamicActivitiesListPulgin.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/code/opmcepaq/uzi9-uzi9q-opmcepaq-epaq/src/main/java/uzi9/uzi9q/opmcepaq/epaq/plugin/operate/activities" afterDir="true" />
-      <change afterPath="$PROJECT_DIR$/code/opmcepaq/uzi9-uzi9q-opmcepaq-epaq/src/main/java/uzi9/uzi9q/opmcepaq/epaq/plugin/operate/activities/DynamicActivitiesOperationPlugIn.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/code/opmcepaq/uzi9-uzi9q-opmcepaq-epaq/src/main/java/uzi9/uzi9q/opmcepaq/epaq/plugin/other/GenConstantUtils.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/code/opmcepaq/uzi9-uzi9q-opmcepaq-epaq/src/main/java/uzi9/uzi9q/opmcepaq/epaq/plugin/other/GenMetaConstantPlugin.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.6.3/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.6.3/checksums/checksums.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.6.3/dependencies-accessors/dependencies-accessors.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.6.3/dependencies-accessors/dependencies-accessors.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.6.3/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.6.3/executionHistory/executionHistory.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.6.3/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.6.3/executionHistory/executionHistory.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.6.3/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.6.3/fileHashes/fileHashes.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.6.3/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.6.3/fileHashes/fileHashes.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.6.3/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.6.3/fileHashes/resourceHashesCache.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/base/uzi9-uzi9q-base-common/build/libs/uzi9-uzi9q-base-common-1.0.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/code/base/uzi9-uzi9q-base-common/build/libs/uzi9-uzi9q-base-common-1.0.0.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/base/uzi9-uzi9q-base-common/build/tmp/jar/MANIFEST.MF" beforeDir="false" afterPath="$PROJECT_DIR$/code/base/uzi9-uzi9q-base-common/build/tmp/jar/MANIFEST.MF" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/base/uzi9-uzi9q-base-helper/build/libs/uzi9-uzi9q-base-helper-1.0.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/code/base/uzi9-uzi9q-base-helper/build/libs/uzi9-uzi9q-base-helper-1.0.0.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/base/uzi9-uzi9q-base-helper/build/tmp/jar/MANIFEST.MF" beforeDir="false" afterPath="$PROJECT_DIR$/code/base/uzi9-uzi9q-base-helper/build/tmp/jar/MANIFEST.MF" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/opmcepaq/uzi9-uzi9q-opmcepaq-epaq/build/libs/uzi9-uzi9q-opmcepaq-epaq-1.0.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/code/opmcepaq/uzi9-uzi9q-opmcepaq-epaq/build/libs/uzi9-uzi9q-opmcepaq-epaq-1.0.0.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/opmcepaq/uzi9-uzi9q-opmcepaq-epaq/build/tmp/compileJava/previous-compilation-data.bin" beforeDir="false" afterPath="$PROJECT_DIR$/code/opmcepaq/uzi9-uzi9q-opmcepaq-epaq/build/tmp/compileJava/previous-compilation-data.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/opmcepaq/uzi9-uzi9q-opmcepaq-epaq/build/tmp/jar/MANIFEST.MF" beforeDir="false" afterPath="$PROJECT_DIR$/code/opmcepaq/uzi9-uzi9q-opmcepaq-epaq/build/tmp/jar/MANIFEST.MF" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/uzi9-cosmic-debug/build/classes/java/main/uzi9/cosmic/debug/DebugApplication.class" beforeDir="false" afterPath="$PROJECT_DIR$/code/uzi9-cosmic-debug/build/classes/java/main/uzi9/cosmic/debug/DebugApplication.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/uzi9-cosmic-debug/build/tmp/compileJava/previous-compilation-data.bin" beforeDir="false" afterPath="$PROJECT_DIR$/code/uzi9-cosmic-debug/build/tmp/compileJava/previous-compilation-data.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/uzi9-cosmic-debug/src/main/java/uzi9/cosmic/debug/DebugApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/code/uzi9-cosmic-debug/src/main/java/uzi9/cosmic/debug/DebugApplication.java" afterDir="false" />
-    </list>
+    <list default="true" id="bd79ff4a-d1d3-414f-9bfa-19719146eaa4" name="更改" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -57,22 +31,6 @@
                 <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
                 <item name="uzi9-cosmic" type="f1a62948:ProjectNode" />
               </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="uzi9-cosmic" type="f1a62948:ProjectNode" />
-                <item name="Tasks" type="e4a08cd1:TasksNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="uzi9-cosmic" type="f1a62948:ProjectNode" />
-                <item name="uzi9-uzi9q-base-common" type="2d1252cf:ModuleNode" />
-              </path>
-              <path>
-                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
-                <item name="uzi9-cosmic" type="f1a62948:ProjectNode" />
-                <item name="uzi9-uzi9q-base-common" type="2d1252cf:ModuleNode" />
-                <item name="Tasks" type="e4a08cd1:TasksNode" />
-              </path>
             </expand>
             <select />
           </tree_state>
@@ -105,6 +63,7 @@
     "git-widget-placeholder": "baseline",
     "kotlin-language-version-configured": "true",
     "last_opened_file_path": "H:/workspace/cosmic/zhongdian",
+    "node.js.selected.package.tslint": "(autodetect)",
     "project.structure.last.edited": "模块",
     "project.structure.proportion": "0.15",
     "project.structure.side.proportion": "0.30574712",
@@ -140,35 +99,12 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="应用程序.DebugApplication" />
-      </list>
-    </recent_temporary>
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration" cleanupOnStartRun="true">
     <configuration>C:\Users\lhbj\AppData\Roaming\Subversion</configuration>
     <supportedVersion>125</supportedVersion>
   </component>
-  <component name="SvnFileUrlMappingImpl">
-    <option name="myMappingRoots">
-      <list>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="H:\workspace\cosmic\zhongdian" />
-          <option name="myCopyRoot" value="H:\workspace\cosmic\zhongdian" />
-        </SvnCopyRootSimple>
-      </list>
-    </option>
-    <option name="myMoreRealMappingRoots">
-      <list>
-        <SvnCopyRootSimple>
-          <option name="myVcsRoot" value="H:\workspace\cosmic\zhongdian" />
-          <option name="myCopyRoot" value="H:\workspace\cosmic\zhongdian" />
-        </SvnCopyRootSimple>
-      </list>
-    </option>
-  </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="默认任务">
       <changelist id="bd79ff4a-d1d3-414f-9bfa-19719146eaa4" name="更改" comment="" />

+ 1 - 1
code/uzi9-cosmic-debug/src/main/java/kd/cosmic/debug/tools/CosmicLauncher.java

@@ -43,7 +43,7 @@ public final class CosmicLauncher {
      */
     private static final String DEFAULT_COSMIT_HOME_PATH = System.getProperty("user.home").replaceAll("\\\\", "/") + "/cosmic/home";
 	
-	private static final String PROJECT_HOME = "H:/workspace/cosmic/zhongdian";
+	private static final String PROJECT_HOME = "E:/next/zhongdian";
 	
 	private static final String LOCAL_IP = "127.0.0.1";
 	

+ 14 - 22
code/uzi9-cosmic-debug/src/main/java/uzi9/cosmic/debug/DebugApplication.java

@@ -23,40 +23,32 @@ public class DebugApplication  {
 
         CosmicLauncher cosmic = new CosmicLauncher(false);
         //服务ip
-        //String ip="127.0.0.1";
-        String ip="192.168.10.2";
+        String ip1="192.168.1.250";
+//        String ip1="192.168.10.2";
         cosmic.setClusterNumber("cosmic");
         cosmic.setTenantNumber("ierp");
-
 //        cosmic.setConfigUrl("127.0.0.1:2181?user=zk&password=xxx");
         cosmic.setConfigUrl("192.168.1.250:2181?user=zookeeper&password=Free1100");
-
 //        cosmic.setMcServerUrl("http://127.0.0.1:8090");
-        cosmic.setMcServerUrl("http://192.168.1.250:8085/");
+        cosmic.setMcServerUrl("http://192.168.1.250:8095/");
 
-//        cosmic.setFsServerUrl("127.0.0.1", 8100);
-//        cosmic.setImageServerUrl("127.0.0.1", 8100);
-        cosmic.setFsServerUrl(ip, 8100);
-        cosmic.setImageServerUrl(ip, 8100);
+        cosmic.setFsServerUrl("127.0.0.1", 8100);
+        cosmic.setImageServerUrl("127.0.0.1", 8100);
+//        cosmic.setFsServerUrl(ip1, 8100);
+//        cosmic.setImageServerUrl(ip1, 8100);
         //自定义本地苍穹调试服务的端口
-        //cosmic.setCosmicWebPort(8881);
-        cosmic.setCosmicWebURL("http://"+ip,7080);
+        cosmic.setCosmicWebPort(8881);
+//        cosmic.setCosmicWebURL("http://"+ip1,7080);
         cosmic.setDubboConfig(false, true, true);
-
-        //MQ
-        cosmic.setMqHostConfig("172.27.63.12","5672","lhbj","lhbj","ierp");
-        //ES 172.27.63.12:9200 -u elastic:elastic
-        //curl 172.27.63.12:9200 -u elastic:elastic
-        cosmic.set("monitor.es.password","elastic");
-        cosmic.set("monitor.es.user","elastic");
-
-        cosmic.setMqConsumerRegister(true,ip);
+//MQ
+        cosmic.setMqHostConfig("192.168.1.250","5672","admin","123456","cangqiong");
+        cosmic.setMqConsumerRegister(true,ip1);
         System.setProperty("dubbo.registry.register", "true");
         System.setProperty("mq.consumer.register", "true");
-        System.setProperty("mq.debug.queue.tag", ip);
+        System.setProperty("mq.debug.queue.tag", ip1);
         System.setProperty("mqConfigFiles.config", "queue/consummqconfig.xml");
         //Redis
-        cosmic.setRedisConfig("172.27.63.12:6379");
+        cosmic.setRedisConfig("192.168.1.250:6379");
         cosmic.start();
         System.out.println(System.getProperties());
         

+ 2 - 2
gradle.properties

@@ -18,9 +18,9 @@ systemProp.developer_flag=uzi9
 #--This is the project flag
 systemProp.project_flag=uzi9q
 #--This is the project dir
-systemProp.project_dir=H:/workspace/cosmic/zhongdian
+systemProp.project_dir=E:/next/zhongdian
 #--This is the dir for cosmic project libs and static resouces
-systemProp.cosmic_home=H:/workspace/cosmic/zd/studio
+systemProp.cosmic_home=D:/Users/kkuan/cosmic/home
 #--Performance configuration for gradle build
 org.gradle.parallel=true
 org.gradle.daemon=true