Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
7a9bede4
o2oa
项目概览
weixin_42566577
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7a9bede4
编写于
3月 23, 2020
作者:
Z
Zhou Rui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复255bug
上级
2c42b37a
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
55 addition
and
25 deletion
+55
-25
o2server/pom.xml
o2server/pom.xml
+11
-3
o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CreateVersionFile.java
...java/com/x/base/core/project/build/CreateVersionFile.java
+34
-0
o2server/x_console/pom.xml
o2server/x_console/pom.xml
+2
-2
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/unit/ActionCreate.java
...rganization/assemble/control/jaxrs/unit/ActionCreate.java
+4
-10
o2server/x_organization_assemble_control/src/main/webapp/describe/sources/com/x/organization/assemble/control/jaxrs/unit/ActionCreate.java
...rganization/assemble/control/jaxrs/unit/ActionCreate.java
+4
-10
未找到文件。
o2server/pom.xml
浏览文件 @
7a9bede4
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<modelVersion>
4.0.0
</modelVersion>
<groupId>
o2oa
</groupId>
<artifactId>
o2server
</artifactId>
...
...
@@ -228,6 +227,10 @@
<groupId>
org.apache.pdfbox
</groupId>
<artifactId>
jbig2-imageio
</artifactId>
</dependency>
<dependency>
<groupId>
org.apache.maven
</groupId>
<artifactId>
maven-model
</artifactId>
</dependency>
<dependency>
<groupId>
com.adobe.xmp
</groupId>
<artifactId>
xmpcore
</artifactId>
...
...
@@ -485,6 +488,11 @@
<artifactId>
commons-text
</artifactId>
<version>
1.8
</version>
</dependency>
<dependency>
<groupId>
org.apache.maven
</groupId>
<artifactId>
maven-model
</artifactId>
<version>
3.0
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.jetty
</groupId>
<artifactId>
jetty-server
</artifactId>
...
...
o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CreateVersionFile.java
0 → 100644
浏览文件 @
7a9bede4
package
com.x.base.core.project.build
;
import
java.io.File
;
import
java.io.FileReader
;
import
java.util.Date
;
import
java.util.LinkedHashMap
;
import
com.x.base.core.project.gson.XGsonBuilder
;
import
com.x.base.core.project.tools.DateTools
;
import
com.x.base.core.project.tools.DefaultCharset
;
import
org.apache.commons.io.FileUtils
;
import
org.apache.maven.model.Model
;
import
org.apache.maven.model.io.xpp3.MavenXpp3Reader
;
public
class
CreateVersionFile
{
public
static
void
main
(
String
...
args
)
throws
Exception
{
File
base
=
new
File
(
args
[
0
]);
File
file
=
new
File
(
base
,
"../version.o2"
);
File
pom
=
new
File
(
base
,
"../pom.xml"
);
MavenXpp3Reader
reader
=
new
MavenXpp3Reader
();
Model
model
=
reader
.
read
(
new
FileReader
(
pom
));
LinkedHashMap
<
String
,
String
>
map
=
new
LinkedHashMap
<>();
map
.
put
(
"version"
,
model
.
getVersion
()
+
""
);
map
.
put
(
"date"
,
DateTools
.
format
(
new
Date
()));
FileUtils
.
write
(
file
,
XGsonBuilder
.
toJson
(
map
),
DefaultCharset
.
charset_utf_8
);
}
}
o2server/x_console/pom.xml
浏览文件 @
7a9bede4
...
...
@@ -80,7 +80,7 @@
<artifactId>
exec-maven-plugin
</artifactId>
<executions>
<execution>
<id>
packageO2server
</id>
<id>
createVersionFile
</id>
<phase>
install
</phase>
<goals>
<goal>
java
</goal>
...
...
@@ -89,7 +89,7 @@
<addOutputToClasspath>
true
</addOutputToClasspath>
<includePluginDependencies>
true
</includePluginDependencies>
<includeProjectDependencies>
true
</includeProjectDependencies>
<mainClass>
com.x.base.core.project.build.
PackageO2server
<mainClass>
com.x.base.core.project.build.
CreateVersionFile
</mainClass>
<arguments>
<argument>
${basedir}
</argument>
...
...
o2server/x_organization_assemble_control/src/main/java/com/x/organization/assemble/control/jaxrs/unit/ActionCreate.java
浏览文件 @
7a9bede4
package
com.x.organization.assemble.control.jaxrs.unit
;
import
org.apache.commons.lang3.StringUtils
;
import
com.google.gson.Gson
;
import
com.google.gson.JsonElement
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.JpaObject
;
import
com.x.base.core.project.Applications
;
import
com.x.base.core.project.x_message_assemble_communicate
;
import
com.x.base.core.entity.annotation.CheckPersistType
;
import
com.x.base.core.project.bean.WrapCopier
;
import
com.x.base.core.project.bean.WrapCopierFactory
;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.connection.ActionResponse
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.jaxrs.WoId
;
...
...
@@ -20,12 +15,11 @@ import com.x.base.core.project.logger.Logger;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.tools.ListTools
;
import
com.x.organization.assemble.control.Business
;
import
com.x.organization.assemble.control.ThisApplication
;
import
com.x.organization.assemble.control.message.OrgBodyMessage
;
import
com.x.organization.assemble.control.message.OrgMessage
;
import
com.x.organization.assemble.control.message.OrgMessageFactory
;
import
com.x.organization.core.entity.Unit
;
import
org.apache.commons.lang3.StringUtils
;
class
ActionCreate
extends
BaseAction
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
ActionCreate
.
class
);
...
...
@@ -67,7 +61,7 @@ class ActionCreate extends BaseAction {
}
emc
.
beginTransaction
(
Unit
.
class
);
business
.
unit
().
adjustInherit
(
unit
);
emc
.
persist
(
unit
);
emc
.
persist
(
unit
,
CheckPersistType
.
all
);
emc
.
commit
();
ApplicationCache
.
notify
(
Unit
.
class
);
...
...
o2server/x_organization_assemble_control/src/main/webapp/describe/sources/com/x/organization/assemble/control/jaxrs/unit/ActionCreate.java
浏览文件 @
7a9bede4
package
com.x.organization.assemble.control.jaxrs.unit
;
import
org.apache.commons.lang3.StringUtils
;
import
com.google.gson.Gson
;
import
com.google.gson.JsonElement
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.JpaObject
;
import
com.x.base.core.project.Applications
;
import
com.x.base.core.project.x_message_assemble_communicate
;
import
com.x.base.core.entity.annotation.CheckPersistType
;
import
com.x.base.core.project.bean.WrapCopier
;
import
com.x.base.core.project.bean.WrapCopierFactory
;
import
com.x.base.core.project.cache.ApplicationCache
;
import
com.x.base.core.project.connection.ActionResponse
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.jaxrs.WoId
;
...
...
@@ -20,12 +15,11 @@ import com.x.base.core.project.logger.Logger;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.tools.ListTools
;
import
com.x.organization.assemble.control.Business
;
import
com.x.organization.assemble.control.ThisApplication
;
import
com.x.organization.assemble.control.message.OrgBodyMessage
;
import
com.x.organization.assemble.control.message.OrgMessage
;
import
com.x.organization.assemble.control.message.OrgMessageFactory
;
import
com.x.organization.core.entity.Unit
;
import
org.apache.commons.lang3.StringUtils
;
class
ActionCreate
extends
BaseAction
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
ActionCreate
.
class
);
...
...
@@ -67,7 +61,7 @@ class ActionCreate extends BaseAction {
}
emc
.
beginTransaction
(
Unit
.
class
);
business
.
unit
().
adjustInherit
(
unit
);
emc
.
persist
(
unit
);
emc
.
persist
(
unit
,
CheckPersistType
.
all
);
emc
.
commit
();
ApplicationCache
.
notify
(
Unit
.
class
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录