set app

ChijieMa · Apr 27, 2016 · c38f674 · c38f674
1 parent f2d6410
commit c38f674
Show file tree

Hide file tree

Showing 9 changed files with 129 additions and 737 deletions.
diff --git a/RGenerator/src/main/java/org/nights/rgens/plugin/mybatis3/MyBatis3GeneratorUtil.java b/RGenerator/src/main/java/org/nights/rgens/plugin/mybatis3/MyBatis3GeneratorUtil.java
@@ -37,7 +37,7 @@ public class MyBatis3GeneratorUtil {
 	public static void main(String[] args) throws Exception {
 
 
-		for (String name : new String[] { "tfg" }) {
+		for (String name : new String[] { "app" }) {
 			packShortName = name;
 
 //			String xmlName = "generator-" + name + "-config-osgi.xml";
@@ -49,17 +49,17 @@ public static void main(String[] args) throws Exception {
 
 		}
 
-		for (String name : new String[] { "tfg" }) {
-			packShortName = name;
-
-			String xmlName = "generator-" + name + "-config-osgi.xml";
-//			String xmlName = "generator-" + name + "-config.xml";
-
-			Def.GEN_CTRL = xmlName.endsWith("config.xml");
-			testGenerateMyBatis(xmlName, tmpSource);
-
-
-		}
+//		for (String name : new String[] { "tfg" }) {
+//			packShortName = name;
+//			
+//			String xmlName = "generator-" + name + "-config-osgi.xml";
+////			String xmlName = "generator-" + name + "-config.xml";
+//			
+//			Def.GEN_CTRL = xmlName.endsWith("config.xml");
+//			testGenerateMyBatis(xmlName, tmpSource);
+//			
+//			
+//		}
 
 	}
 

diff --git a/RGenerator/src/main/java/org/nights/rgens/plugin/mybatis3/generator-app-config.xml b/RGenerator/src/main/java/org/nights/rgens/plugin/mybatis3/generator-app-config.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE generatorConfiguration PUBLIC
+ "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+ "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+
+<generatorConfiguration>
+	<context id="AdminGenconfig" targetRuntime="MyBatis3"
+		defaultModelType="hierarchical">
+		<plugin type="org.nights.rgens.plugin.mybatis3.MySqlJavaPlugin" />
+		<plugin type="org.nights.rgens.plugin.mybatis3.SqlDaoSupportPlugin" />
+		<plugin type="org.nights.rgens.plugin.mybatis3.DaoExamplePlugin" />
+		<plugin type="org.mybatis.generator.plugins.EqualsHashCodePlugin" />
+		<plugin type="org.mybatis.generator.plugins.ToStringPlugin" />
+		<plugin type="org.mybatis.generator.plugins.CaseInsensitiveLikePlugin" />
+
+		<jdbcConnection driverClass="com.mysql.jdbc.Driver"
+			connectionURL="jdbc:mysql://127.0.0.1:3306/APP?autoReconnect=true"
+			userId="root" password="000000" />
+
+		<javaTypeResolver>
+			<property name="forceBigDecimals" value="false" />
+		</javaTypeResolver>
+
+		<javaModelGenerator targetPackage="onight.tfg.ordbgens"
+			targetProject="/Users/brew/Documents/KJ/MING/git/appadmin/src/gens/java">
+			<property name="enableSubPackages" value="true" />
+			<property name="trimStrings" value="false" />
+		</javaModelGenerator>
+
+		<sqlMapGenerator targetPackage="onight.tfg.ordbgens"
+			targetProject="/Users/brew/Documents/KJ/MING/git/appadmin/src/gens/java">
+			<property name="enableSubPackages" value="true" />
+		</sqlMapGenerator>
+
+		<javaClientGenerator type="ANNOTATEDMAPPER"
+			targetPackage="onight.tfg.ordbgens"
+			targetProject="/Users/brew/Documents/KJ/MING/git/appadmin/src/gens/java">
+			<property name="enableSubPackages" value="true" />
+			<!-- <property name="pbdir"
+				value="/Users/brew/Documents/ming/mcs/restface/src/gens/proto/pbgens.proto" /> -->
+
+		</javaClientGenerator>
+
+		<table tableName="^APP_.*" domainObjectName="app" />
+
+	</context>
+</generatorConfiguration>
diff --git a/RGenerator/target/classes/org/nights/rgens/plugin/mybatis3/MyBatis3GeneratorUtil.class b/RGenerator/target/classes/org/nights/rgens/plugin/mybatis3/MyBatis3GeneratorUtil.class
diff --git a/RGenerator/target/classes/org/nights/rgens/plugin/mybatis3/MyBatis3GeneratorUtil.java b/RGenerator/target/classes/org/nights/rgens/plugin/mybatis3/MyBatis3GeneratorUtil.java
@@ -37,7 +37,7 @@ public class MyBatis3GeneratorUtil {
 	public static void main(String[] args) throws Exception {
 
 
-		for (String name : new String[] { "tfg" }) {
+		for (String name : new String[] { "app" }) {
 			packShortName = name;
 
 //			String xmlName = "generator-" + name + "-config-osgi.xml";
@@ -49,17 +49,17 @@ public static void main(String[] args) throws Exception {
 
 		}
 
-		for (String name : new String[] { "tfg" }) {
-			packShortName = name;
-
-			String xmlName = "generator-" + name + "-config-osgi.xml";
-//			String xmlName = "generator-" + name + "-config.xml";
-
-			Def.GEN_CTRL = xmlName.endsWith("config.xml");
-			testGenerateMyBatis(xmlName, tmpSource);
-
-
-		}
+//		for (String name : new String[] { "tfg" }) {
+//			packShortName = name;
+//			
+//			String xmlName = "generator-" + name + "-config-osgi.xml";
+////			String xmlName = "generator-" + name + "-config.xml";
+//			
+//			Def.GEN_CTRL = xmlName.endsWith("config.xml");
+//			testGenerateMyBatis(xmlName, tmpSource);
+//			
+//			
+//		}
 
 	}
 

diff --git a/gamectrl/.project b/gamectrl/.project
@@ -11,13 +11,23 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
 			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.wst.common.project.facet.core.builder (2).launch</value>
+				</dictionary>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
 			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.wst.validation.validationbuilder (2).launch</value>
+				</dictionary>
 			</arguments>
 		</buildCommand>
 	</buildSpec>

diff --git a/gamectrl/src/main/scala/starstart/cgw/gamectrl/scala/np/P012_MoneyDispatch.scala b/gamectrl/src/main/scala/starstart/cgw/gamectrl/scala/np/P012_MoneyDispatch.scala
@@ -13,7 +13,7 @@ import onight.tfg.ordbgens.tlt.entity.TLTCoreWinExample
 import onight.tfg.ordbgens.tlt.entity.TLTIssue
 import onight.tfg.ordbgens.tlt.entity.TLTIssueSteps
 import onight.tfw.otransio.api.beans.FixHeader
-import onight.tfw.otransio.api.beans.FramePacket
+import onight.tfw.otransio.api.beans.FramePacket 
 import onight.tfw.outils.serialize.SerializerFactory
 import starstart.cgw.gamectrl.scala.persist.Mysqls
 import onight.tfw.otransio.api.IPacketSender
@@ -64,8 +64,11 @@ object P012_MoneyDispatch extends OProcessor with OLog {
         up.setStatus("2")
         Mysqls.corewinDAO.updateByPrimaryKey(up);
       }
+      def onFailed(e: Exception, v: FramePacket) {
+        log.warn("failed in send money:",e)
+      }
     }
-    Sender.ps.send(fp, cb)
+    Sender.ps.asyncSend(fp, cb)
 
     //    forwordpack.setBody(proxypack.getJsbody.getBytes)
 

diff --git a/gamectrl/src/main/scala/starstart/cgw/gamectrl/scala/service/Sender.scala b/gamectrl/src/main/scala/starstart/cgw/gamectrl/scala/service/Sender.scala
@@ -6,7 +6,6 @@ import onight.scala.commons.SessionModules
 import onight.tfw.ojpa.api.annotations.StoreDAO
 import onight.tfw.ojpa.api.OJpaDAO
 import scala.beans.BeanProperty
-import onight.tfg.ordbgens.tlt.entity.TLTCoreBet
 import onight.tfw.otransio.api.PSender
 import onight.tfw.otransio.api.IPacketSender
 

diff --git a/gamectrl/src/models/create_sys.sql b/gamectrl/src/models/create_sys.sql
@@ -27,19 +27,18 @@ drop table if exists T_SYS_USER_ROLE;
 /*==============================================================*/
 create table T_SYS_BRANCH
 (
-   ID					VARCHAR(32) not null,
    BRANCH_ID            VARCHAR(38) not null,
-   BRANCH_DESC          VARCHAR(200),
-   BRANCH_NAME          VARCHAR(100),
-   BRANCH_MANAGER       VARCHAR(50),
-   MOBILE               VARCHAR(20),
+   BRANCH_DESC          VARCHAR(200) COMMENT '机构描述', 
+   BRANCH_NAME          VARCHAR(100) COMMENT '机构名称',
+   BRANCH_MANAGER       VARCHAR(50) COMMENT '管理员',
+   MOBILE               VARCHAR(20) COMMENT '机构名称',
    BEGIN_TIME           datetime,
    END_TIME             datetime,
    PARENT_ID            VARCHAR(38) not null,
    LEAF_FLAG            int not null COMMENT '1是，0不是',
    BRANCH_SEQ           int not null,
    LEVEL                int not null,
-   primary key (ID)
+   primary key (BRANCH_ID)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT = "(按层级编码，三位一级，100开头，顺序递增，有系统自动控制)',";
 
 /*==============================================================*/