Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
duckula
duckula-ops
提交
ca2968fd
duckula-ops
项目概览
duckula
/
duckula-ops
通知
6
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
duckula-ops
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
ca2968fd
编写于
7月 02, 2021
作者:
偏锋书生
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
把db做为配置选项
上级
465c2815
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
46 addition
and
36 deletion
+46
-36
pom.xml
pom.xml
+10
-6
src/main/java/net/wicp/tams/duckula/ops/App.java
src/main/java/net/wicp/tams/duckula/ops/App.java
+3
-3
src/main/java/net/wicp/tams/duckula/ops/pages/cas/GroupManager.java
...ava/net/wicp/tams/duckula/ops/pages/cas/GroupManager.java
+5
-6
src/main/java/net/wicp/tams/duckula/ops/pages/cas/PositionManager.java
.../net/wicp/tams/duckula/ops/pages/cas/PositionManager.java
+4
-6
src/main/java/net/wicp/tams/duckula/ops/pages/cas/UserManager.java
...java/net/wicp/tams/duckula/ops/pages/cas/UserManager.java
+6
-9
src/main/java/net/wicp/tams/duckula/ops/pages/tools/GroupAssign.java
...va/net/wicp/tams/duckula/ops/pages/tools/GroupAssign.java
+4
-2
src/main/java/net/wicp/tams/duckula/ops/pages/tools/PositionAssign.java
...net/wicp/tams/duckula/ops/pages/tools/PositionAssign.java
+2
-3
src/main/java/net/wicp/tams/duckula/ops/services/AppModule.java
...in/java/net/wicp/tams/duckula/ops/services/AppModule.java
+12
-1
未找到文件。
pom.xml
浏览文件 @
ca2968fd
...
...
@@ -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
浏览文件 @
ca2968fd
...
...
@@ -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
浏览文件 @
ca2968fd
...
...
@@ -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
浏览文件 @
ca2968fd
...
...
@@ -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
浏览文件 @
ca2968fd
...
...
@@ -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
浏览文件 @
ca2968fd
...
...
@@ -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
浏览文件 @
ca2968fd
...
...
@@ -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
浏览文件 @
ca2968fd
...
...
@@ -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);
// }
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录