wager api ok;

ChijieMa · Apr 7, 2016 · 20d7d0b · 20d7d0b
1 parent 5c6536c
commit 20d7d0b
Show file tree

Hide file tree

Showing 451 changed files with 14,336 additions and 139,712 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
@@ -39,9 +39,11 @@ public static void main(String[] args) throws Exception {
 
 		for (String name : new String[] { "tfg" }) {
 			packShortName = name;
-			Def.GEN_CTRL = false;
-//			String xmlName = "generator-" + name + "-config.xml";
-			String xmlName = "generator-" + name + "-config-osgi.xml";
+
+			String xmlName = "generator-" + name + "-config.xml";
+//			String xmlName = "generator-" + name + "-config-osgi.xml";
+
+			Def.GEN_CTRL = xmlName.endsWith("config.xml");
 			testGenerateMyBatis(xmlName, tmpSource);
 		}
 

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
@@ -39,9 +39,11 @@ public static void main(String[] args) throws Exception {
 
 		for (String name : new String[] { "tfg" }) {
 			packShortName = name;
-			Def.GEN_CTRL = false;
-//			String xmlName = "generator-" + name + "-config.xml";
-			String xmlName = "generator-" + name + "-config-osgi.xml";
+
+			String xmlName = "generator-" + name + "-config.xml";
+//			String xmlName = "generator-" + name + "-config-osgi.xml";
+
+			Def.GEN_CTRL = xmlName.endsWith("config.xml");
 			testGenerateMyBatis(xmlName, tmpSource);
 		}
 

diff --git a/cmysqlimpl/src/main/java/starstart/cgateway/mysql/provider/MysqlStoreProvider.java b/cmysqlimpl/src/main/java/starstart/cgateway/mysql/provider/MysqlStoreProvider.java
@@ -35,7 +35,7 @@ public void shutdown(){
 
 	@Override
 	public String getProviderid() {
-		return "actmysql";
+		return "cmysql";
 	}
 
 }
diff --git a/cruntime/bundle/onight.tfw.oapi-2.1.2.jar → cruntime/bundle/onight.tfw.oapi-2.1.3.jar b/cruntime/bundle/onight.tfw.oapi-2.1.2.jar → cruntime/bundle/onight.tfw.oapi-2.1.3.jar
diff --git a/cruntime/conf/ofw.properties b/cruntime/conf/ofw.properties
@@ -3,7 +3,7 @@
 # for db 
 
 ofw.ordb.driver=com.mysql.jdbc.Driver
-ofw.ordb.url=jdbc:mysql://127.0.0.1:3306/TFG?autoReconnect=true
+ofw.ordb.url=jdbc:mysql://127.0.0.1:3306/TFG?autoReconnect=true&useUnicode=true&characterEncoding=utf8
 ofw.ordb.usr=root
 ofw.ordb.pwd=000000
 

diff --git a/gamectrl/src/main/java/starstart/cgame/flows/land/util/BeanToXmlUtil.java b/gamectrl/src/main/java/starstart/cgame/flows/land/util/BeanToXmlUtil.java