把db做为配置选项

pom.xml

@@ -302,11 +302,8 @@
 			<artifactId>mysql-connector-java</artifactId>
 			<version>5.1.47</version>
 		</dependency>
-		<!-- dependency>
-			<groupId>com.baomidou</groupId>
-			<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-			<version>3.2.0</version>
-		</dependency-->
+		<!-- dependency> <groupId>com.baomidou</groupId> <artifactId>dynamic-datasource-spring-boot-starter</artifactId> 
+			<version>3.2.0</version> </dependency -->
 		<!--end mybatis plus -->
 		<dependency>
 			<groupId>net.wicp.tams</groupId>
@@ -326,6 +323,12 @@
 			<artifactId>tams-cas</artifactId>
 			<version>1.2.8</version>
 		</dependency>
+		<!-- 添加安全 -->
+		<!-- dependency>
+			<groupId>org.tynamo</groupId>
+			<artifactId>tapestry-security</artifactId>
+			<version>0.9.0</version>
+		</dependency -->
 	</dependencies>
 	<build>
 		<finalName>duckula-ops</finalName>
@@ -335,7 +338,8 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<!-- Enable io.kubernetes:client-java to find its model classes. -->
-				    <!-- Caused by: java.io.IOException: Unknown apiVersionKind: v1/ConfigMap known kinds are: {} -->
+					<!-- Caused by: java.io.IOException: Unknown apiVersionKind: v1/ConfigMap 
+						known kinds are: {} -->
 					<requiresUnpack>
 						<dependency>
 							<groupId>io.kubernetes</groupId>

src/main/java/net/wicp/tams/duckula/ops/App.java

@@ -16,7 +16,7 @@ import net.wicp.tams.common.spring.autoconfig.annotation.EnableTams;
 @ComponentScan(basePackages = { "net.wicp.tams.app.duckula.controller", "net.wicp.tams.duckula.ops" })
 @ImportResource("classpath:beanRefContext.xml")
 //@MapperScan("net.wicp.tams.app.duckula.controller.dao")
-@EnableTams
+@EnableTams(springconfpres = "spring.datasource.:common.jdbc.datasource.default.")
 public class App extends SpringBootServletInitializer {
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
@@ -28,8 +28,8 @@ public class App extends SpringBootServletInitializer {
 		Conf.overProp("common.spring.autoconfig.property.path", "abs:/data/duckula-data/conf/duckula-ops.properties");
 		Conf.overProp("common.spring.autoconfig.contextInit.duckulaops",
 				"net.wicp.tams.app.duckula.controller.service.ContextInitDo");
-		// 注意：SQL拦截需要db信息查列名与配置的拦截列名匹配，它也url后面的配置是一样的
-		Conf.overProp("common.jdbc.datasource.default.defaultdb", "duckula");
+		// 注意：SQL拦截需要db信息查列名与配置的拦截列名匹配，它也url后面的配置是一样的(已通过@EnableTams完成)
+		//Conf.overProp("common.jdbc.datasource.default.defaultdb", "duckula");
 		SpringApplication application = new SpringApplication(App.class);
 		application.setApplicationContextClass(AnnotationConfigWebApplicationContext.class);
 		BusiTools.printAscill();

src/main/java/net/wicp/tams/duckula/ops/pages/cas/GroupManager.java

@@ -14,17 +14,16 @@ import org.apache.tapestry5.util.TextStreamResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import net.wicp.tams.app.duckula.controller.bean.constant.UnitType;
 import net.wicp.tams.app.duckula.controller.bean.models.SysGroup;
 import net.wicp.tams.app.duckula.controller.bean.models.SysOrg;
 import net.wicp.tams.app.duckula.controller.dao.SysGroupMapper;
 import net.wicp.tams.app.duckula.controller.dao.SysOrgMapper;
 import net.wicp.tams.app.duckula.controller.service.cas.impl.OrgService;
-import net.wicp.tams.cas.constant.ColsSysOrg;
+import net.wicp.tams.cas.bean.constant.ColsSysGroup;
+import net.wicp.tams.cas.bean.constant.ColsSysOrg;
 import net.wicp.tams.common.apiext.StringUtil;
 import net.wicp.tams.common.apiext.json.EasyUiAssist;
 import net.wicp.tams.common.callback.IConvertValue;
-import net.wicp.tams.common.callback.impl.convertvalue.ConvertValueEnum;
 import net.wicp.tams.common.jdbc.convert.ConvertValueMysql;
 import net.wicp.tams.component.tools.TapestryAssist;
 import net.wicp.tams.duckula.ops.pages.ParentPageBean;
@@ -83,17 +82,17 @@ public class GroupManager extends ParentPageBean<SysGroup> {
 		org.apache.tapestry5.json.JSONArray orgIds = TapestryAssist.getParams(params, "orgId");
 		QueryWrapper<SysGroup> queryWrapper = new QueryWrapper<SysGroup>();
 		if (StringUtils.isNotBlank(groupName)) {
-			queryWrapper.likeLeft("group_name", groupName);
+			queryWrapper.likeLeft(ColsSysGroup.groupName.getOriColName(), groupName);
 		}
 		if (orgIds != null && orgIds.size() > 0) {
 			List<Long> orglist = new ArrayList<Long>();
 			for (int i = 0; i < orgIds.size(); i++) {
 				orglist.add(Long.parseLong(orgIds.getString(i)));
 			}
-			queryWrapper.in("org_id", orglist);
+			queryWrapper.in(ColsSysGroup.orgId.getOriColName(), orglist);
 		}
 		List<SysGroup> groups = this.sysGroupMapper.selectList(queryWrapper);
-		ConvertValueMysql orgconv = new ConvertValueMysql(ColsSysOrg.db, ColsSysOrg.tb, "org_name");
+		ConvertValueMysql orgconv = new ConvertValueMysql(ColsSysOrg.tb,ColsSysOrg.orgName.getOriColName());
 		Map<String, IConvertValue> map = new HashMap<String, IConvertValue>();
 		map.put("orgId1", orgconv);
 		String str = EasyUiAssist.getJsonForGridAlias2(groups, new String[] { "orgId,orgId1" }, map, groups.size());

src/main/java/net/wicp/tams/duckula/ops/pages/cas/PositionManager.java

@@ -14,17 +14,15 @@ import org.apache.tapestry5.util.TextStreamResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import net.wicp.tams.app.duckula.controller.bean.constant.UnitType;
-import net.wicp.tams.app.duckula.controller.bean.models.SysPosition;
 import net.wicp.tams.app.duckula.controller.bean.models.SysOrg;
-import net.wicp.tams.app.duckula.controller.dao.SysPositionMapper;
+import net.wicp.tams.app.duckula.controller.bean.models.SysPosition;
 import net.wicp.tams.app.duckula.controller.dao.SysOrgMapper;
+import net.wicp.tams.app.duckula.controller.dao.SysPositionMapper;
 import net.wicp.tams.app.duckula.controller.service.cas.impl.OrgService;
-import net.wicp.tams.cas.constant.ColsSysOrg;
+import net.wicp.tams.cas.bean.constant.ColsSysOrg;
 import net.wicp.tams.common.apiext.StringUtil;
 import net.wicp.tams.common.apiext.json.EasyUiAssist;
 import net.wicp.tams.common.callback.IConvertValue;
-import net.wicp.tams.common.callback.impl.convertvalue.ConvertValueEnum;
 import net.wicp.tams.common.jdbc.convert.ConvertValueMysql;
 import net.wicp.tams.component.tools.TapestryAssist;
 import net.wicp.tams.duckula.ops.pages.ParentPageBean;
@@ -93,7 +91,7 @@ public class PositionManager extends ParentPageBean<SysPosition> {
 			queryWrapper.in("org_id", orglist);
 		}
 		List<SysPosition> groups = this.sysPositionMapper.selectList(queryWrapper);
-		ConvertValueMysql orgconv = new ConvertValueMysql(ColsSysOrg.db, ColsSysOrg.tb, "org_name");
+		ConvertValueMysql orgconv = new ConvertValueMysql( ColsSysOrg.tb,ColsSysOrg.orgName.getOriColName());
 		Map<String, IConvertValue> map = new HashMap<String, IConvertValue>();
 		map.put("orgId1", orgconv);
 		String str = EasyUiAssist.getJsonForGridAlias2(groups, new String[] { "orgId,orgId1" }, map, groups.size());

src/main/java/net/wicp/tams/duckula/ops/pages/cas/UserManager.java

@@ -20,7 +20,7 @@ import net.wicp.tams.app.duckula.controller.bean.models.SysOrg;
 import net.wicp.tams.app.duckula.controller.bean.models.SysUser;
 import net.wicp.tams.app.duckula.controller.dao.SysUserMapper;
 import net.wicp.tams.app.duckula.controller.service.cas.impl.OrgService;
-import net.wicp.tams.cas.constant.ColsSysOrg;
+import net.wicp.tams.cas.bean.constant.ColsSysOrg;
 import net.wicp.tams.common.Result;
 import net.wicp.tams.common.apiext.CollectionUtil;
 import net.wicp.tams.common.apiext.PwdUtil;
@@ -38,9 +38,7 @@ public class UserManager extends ParentPageBean<SysUser> {
 
 	@Inject
 	private SysUserMapper sysUserMapper;
-	
-	
-	
+
 	@SuppressWarnings("rawtypes")
 	public TextStreamResponse onQuery() {
 		org.apache.tapestry5.json.JSONObject params = TapestryAssist.packParams(request, true);
@@ -58,16 +56,15 @@ public class UserManager extends ParentPageBean<SysUser> {
 			queryWrapper.in("org_id", orglist);
 		}
 		List<SysUser> users = this.sysUserMapper.selectList(queryWrapper);
-		ConvertValueMysql orgconv = new ConvertValueMysql(ColsSysOrg.db, ColsSysOrg.tb, "org_name");
+		ConvertValueMysql orgconv = new ConvertValueMysql(ColsSysOrg.tb, ColsSysOrg.orgName.getOriColName());
 		Map<String, IConvertValue> map = new HashMap<String, IConvertValue>();
 		map.put("orgId1", orgconv);
 		map.put("status1", new ConvertValueEnum(YesOrNo.class));
 		map.put("gender1", new ConvertValueEnum(Gender.class));
-		String str = EasyUiAssist.getJsonForGridAlias2(users, new String[] {  "orgId,orgId1", "status,status1", "gender,gender1" }, map, users.size());
+		String str = EasyUiAssist.getJsonForGridAlias2(users,
+				new String[] { "orgId,orgId1", "status,status1", "gender,gender1" }, map, users.size());
 		return retStream(str);
 	}
-	
-	
 
 	@Override
 	public void packageQuery(SysUser t, QueryWrapper<SysUser> queryWrapper) {
@@ -79,7 +76,7 @@ public class UserManager extends ParentPageBean<SysUser> {
 
 	@Override
 	protected Pair<String[], Map<String, IConvertValue>> packageConvert() {
-		ConvertValueMysql orgCv = new ConvertValueMysql(ColsSysOrg.db, ColsSysOrg.tb, "org_name");
+		ConvertValueMysql orgCv = new ConvertValueMysql(ColsSysOrg.tb, ColsSysOrg.orgName.getOriColName());
 		return Pair.of(new String[] { "orgId,orgId1", "status,status1", "gender,gender1" },
 				CollectionUtil.newMap("orgId1", orgCv, "status1", new ConvertValueEnum(YesOrNo.class), "gender1",
 						new ConvertValueEnum(Gender.class)));

src/main/java/net/wicp/tams/duckula/ops/pages/tools/GroupAssign.java

@@ -27,11 +27,13 @@ import net.wicp.tams.app.duckula.controller.bean.models.SysUserGroupExample;
 import net.wicp.tams.app.duckula.controller.dao.SysGroupMapper;
 import net.wicp.tams.app.duckula.controller.dao.SysUserGroupMapper;
 import net.wicp.tams.app.duckula.controller.service.cas.IOrgService;
-import net.wicp.tams.cas.constant.ColsSysOrg;
+import net.wicp.tams.cas.bean.constant.ColsSysOrg;
 import net.wicp.tams.common.Result;
 import net.wicp.tams.common.apiext.CollectionUtil;
 import net.wicp.tams.common.apiext.StringUtil;
+import net.wicp.tams.common.apiext.jdbc.JdbcAssit;
 import net.wicp.tams.common.callback.IConvertValue;
+import net.wicp.tams.common.jdbc.DruidAssit;
 import net.wicp.tams.common.jdbc.convert.ConvertValueMysql;
 import net.wicp.tams.component.SymbolConstantsCus;
 import net.wicp.tams.component.tools.TapestryAssist;
@@ -92,7 +94,7 @@ public class GroupAssign extends ParentPage {
 		});
 		convmap = new HashMap<String, IConvertValue<String>>();//
 		convmap.put("orgName1",
-				new ConvertValueMysql(ColsSysOrg.db, ColsSysOrg.tb, ColsSysOrg.orgName.getOriColName()));
+				new ConvertValueMysql( DruidAssit.getDefaultDb("defautl"), ColsSysOrg.tb, ColsSysOrg.orgName.getOriColName()));
 		selAll(staffId, null);
 	}
 

src/main/java/net/wicp/tams/duckula/ops/pages/tools/PositionAssign.java

@@ -27,7 +27,7 @@ import net.wicp.tams.app.duckula.controller.bean.models.SysUserPositionExample.C
 import net.wicp.tams.app.duckula.controller.dao.SysPositionMapper;
 import net.wicp.tams.app.duckula.controller.dao.SysUserPositionMapper;
 import net.wicp.tams.app.duckula.controller.service.cas.IOrgService;
-import net.wicp.tams.cas.constant.ColsSysOrg;
+import net.wicp.tams.cas.bean.constant.ColsSysOrg;
 import net.wicp.tams.common.Result;
 import net.wicp.tams.common.apiext.CollectionUtil;
 import net.wicp.tams.common.apiext.StringUtil;
@@ -93,7 +93,7 @@ public class PositionAssign extends ParentPage {
 		});
 		convmap = new HashMap<String, IConvertValue<String>>();//
 		convmap.put("orgName1",
-				new ConvertValueMysql(ColsSysOrg.db, ColsSysOrg.tb, ColsSysOrg.orgName.getOriColName()));
+				new ConvertValueMysql(ColsSysOrg.tb, ColsSysOrg.orgName.getOriColName()));
 		selAll(staffId, null);
 	}
 
@@ -147,7 +147,6 @@ public class PositionAssign extends ParentPage {
 	 * @param selIds
 	 * @return
 	 */
-	@SuppressWarnings("unchecked")
 	@OnEvent(value = SymbolConstantsCus.EVENT_SAVE)
 	private Result sava(JSONArray selIds) {
 		if (selIds == null) {

src/main/java/net/wicp/tams/duckula/ops/services/AppModule.java

@@ -75,7 +75,7 @@ public class AppModule {
 		// client-side data.
 		configuration.add(SymbolConstants.HMAC_PASSPHRASE, "change this immediately-" + UUID.randomUUID());
 
-		configuration.add(SymbolConstantsCas.conf_cas_db, "duckula");// 示例，需要配置全局db
+		//configuration.add(SymbolConstantsCas.conf_cas_db, "duckula");// 示例，需要配置全局db
 	}
 
 	/**
@@ -207,4 +207,15 @@ public class AppModule {
 		configuration.add("/connector");
 		configuration.add("/websocket");
 	}
+
+//	/***
+//	 * 安装配置
+//	 * 
+//	 * @param configuration
+//	 */
+//	@Contribute(WebSecurityManager.class)
+//	public static void addRealms(Configuration<Realm> configuration) {
+//		ExtendedPropertiesRealm realm = new ExtendedPropertiesRealm("classpath:shiro-users.properties");
+//		configuration.add(realm);
+//	}
 }