整理
diff --git a/web/platform-biz-sample-web-notes/pom.xml b/web/platform-biz-sample-web-notes/pom.xml
index 5de805b..8642159 100644
--- a/web/platform-biz-sample-web-notes/pom.xml
+++ b/web/platform-biz-sample-web-notes/pom.xml
@@ -26,6 +26,10 @@
</dependency>
<dependency>
<groupId>com.supwisdom.platform.biz</groupId>
+ <artifactId>platform-module-resources</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.supwisdom.platform.biz</groupId>
<artifactId>platform-module-domain</artifactId>
</dependency>
<dependency>
@@ -34,15 +38,11 @@
</dependency>
<dependency>
<groupId>com.supwisdom.platform.biz</groupId>
- <artifactId>platform-module-security</artifactId>
- </dependency>
- <dependency>
- <groupId>com.supwisdom.platform.biz</groupId>
<artifactId>platform-module-log</artifactId>
</dependency>
<dependency>
<groupId>com.supwisdom.platform.biz</groupId>
- <artifactId>platform-module-resources</artifactId>
+ <artifactId>platform-module-security</artifactId>
</dependency>
<dependency>
<groupId>com.supwisdom.platform.biz</groupId>
diff --git a/web/platform-biz-sample-web-notes/src/main/resources/appParamConfig.properties b/web/platform-biz-sample-web-notes/src/main/resources/appParamConfig.properties
new file mode 100644
index 0000000..39f95cb
--- /dev/null
+++ b/web/platform-biz-sample-web-notes/src/main/resources/appParamConfig.properties
@@ -0,0 +1,7 @@
+resourcePath=/biz-notes
+debugMode=false
+copyJarJspFile=false
+sitFooterInfo=\u4E0A\u6D77\u6811\u7EF4\u4FE1\u606F\u79D1\u6280\u6709\u9650\u516C\u53F8
+
+tempPath=d:/temp/
+resourceServerUrl=http://app.supwisdom.com:9080/resources
diff --git a/web/platform-biz-sample-web-notes/src/main/resources/cache/platform-module-security-beanmap.properties b/web/platform-biz-sample-web-notes/src/main/resources/cache/platform-module-security-beanmap.properties
new file mode 100644
index 0000000..e13e665
--- /dev/null
+++ b/web/platform-biz-sample-web-notes/src/main/resources/cache/platform-module-security-beanmap.properties
@@ -0,0 +1,3 @@
+#\u5b9e\u4f53\u7f13\u5b58\u914d\u7f6e
+#com.supwisdom.platform.biz.module.domain.security.sys.Organize=name
+#com.supwisdom.platform.biz.module.domain.security.sys.SecurityUser=name,username
diff --git a/web/platform-biz-sample-web-notes/src/main/resources/oauth.properties b/web/platform-biz-sample-web-notes/src/main/resources/oauth2.properties
similarity index 100%
rename from web/platform-biz-sample-web-notes/src/main/resources/oauth.properties
rename to web/platform-biz-sample-web-notes/src/main/resources/oauth2.properties
diff --git a/web/platform-biz-sample-web-notes/src/main/resources/redis.properties b/web/platform-biz-sample-web-notes/src/main/resources/redis.properties
index 39b8da5..1832026 100644
--- a/web/platform-biz-sample-web-notes/src/main/resources/redis.properties
+++ b/web/platform-biz-sample-web-notes/src/main/resources/redis.properties
@@ -1,4 +1,3 @@
-#redis.hostName = 192.168.1.229
redis.hostName = localhost
redis.port = 6379
redis.password =
\ No newline at end of file
diff --git a/web/platform-biz-sample-web-notes/src/main/resources/spring-override/platform-core-framework/spring-cache.xml b/web/platform-biz-sample-web-notes/src/main/resources/spring-override/platform-core-framework/spring-cache.xml
index 3d608fa..4e39005 100644
--- a/web/platform-biz-sample-web-notes/src/main/resources/spring-override/platform-core-framework/spring-cache.xml
+++ b/web/platform-biz-sample-web-notes/src/main/resources/spring-override/platform-core-framework/spring-cache.xml
@@ -6,22 +6,15 @@
http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
<!-- 默认使用CacheInMemoryVisitorImpl，如果想使用Redis缓存，请去掉注释 -->
- <!-- <bean id="cacheVisitor" class="com.supwisdom.platform.biz.core.common.cache.impl.CacheInRedisVisitorImpl">
+ <bean id="cacheVisitor" class="com.supwisdom.platform.biz.core.common.cache.impl.CacheInMemoryVisitorImpl" />
+
+ <!-- 单机部署，可以使用EhCache缓存 -->
+ <!-- <bean id="cacheVisitor" class="com.supwisdom.platform.biz.core.common.cache.impl.CacheInEhCacheVisitorImpl" /> -->
+
+ <!-- 集群部署，可以使用Redis缓存，并启用 main.xml 中的 jedisConnectionFactory 配置 -->
+ <!--
+ <bean id="cacheVisitor" class="com.supwisdom.platform.biz.core.common.cache.impl.CacheInRedisVisitorImpl">
<constructor-arg ref="jedisConnectionFactory"/>
</bean>
-
- <bean id="propertyPlaceHolder" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="ignoreUnresolvablePlaceholders" value="true" />
- <property name="locations">
- <list>
- <value>classpath:redis.properties</value>
- </list>
- </property>
- </bean>
-
- <bean id="jedisConnectionFactory" class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory" >
- <property name="hostName" value="${redis.hostName}"/>
- <property name="port" value="${redis.port}"/>
- <property name="password" value="${redis.password}"/>
- </bean> -->
+ -->
</beans>
\ No newline at end of file
diff --git a/web/platform-biz-sample-web-notes/src/main/resources/spring-override/platform-module-security/spring-security-oauth2.xml b/web/platform-biz-sample-web-notes/src/main/resources/spring-override/platform-module-security/spring-security-oauth2.xml
index eb475ca..0a90439 100644
--- a/web/platform-biz-sample-web-notes/src/main/resources/spring-override/platform-module-security/spring-security-oauth2.xml
+++ b/web/platform-biz-sample-web-notes/src/main/resources/spring-override/platform-module-security/spring-security-oauth2.xml
@@ -6,9 +6,14 @@
http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
- <!-- 默认使用 InMemoryTokenStore，如果想使用RedisTokenStore，请去掉注释，且spring-cahche.xml中的也需要去掉Redis注释-->
- <!-- <bean id="tokenStore" class="org.springframework.security.oauth2.provider.token.store.redis.RedisTokenStore" >
+ <!-- 默认使用 InMemoryTokenStore -->
+ <bean id="tokenStore" class="org.springframework.security.oauth2.provider.token.store.InMemoryTokenStore" />
+
+ <!-- 如果想使用RedisTokenStore，请去掉注释，且spring-cahche.xml中的也需要去掉Redis注释，并启用 main.xml 中的 jedisConnectionFactory 配置 -->
+ <!--
+ <bean id="tokenStore" class="org.springframework.security.oauth2.provider.token.store.redis.RedisTokenStore" >
<constructor-arg ref="jedisConnectionFactory"/>
- </bean> -->
+ </bean>
+ -->
</beans>
\ No newline at end of file
diff --git a/web/platform-biz-sample-web-notes/src/main/resources/spring/main.xml b/web/platform-biz-sample-web-notes/src/main/resources/spring/main.xml
index e24857c..2f47f12 100644
--- a/web/platform-biz-sample-web-notes/src/main/resources/spring/main.xml
+++ b/web/platform-biz-sample-web-notes/src/main/resources/spring/main.xml
@@ -36,39 +36,40 @@
<bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
<property name="dataSource" ref="dataSource" />
</bean>
-
+
+ <!-- 具体配置请修改 appParamConfig.properties 文件 -->
<bean id="appParamConfig" class="com.supwisdom.platform.biz.core.framework.utils.AppParamConfig">
<property name="resourcePath">
- <value>/biz-api</value>
- </property>
- <!-- 上线后此项应设置为false -->
- <property name="debugMode">
- <value>false</value>
- </property>
- <!-- 是否把JAR中的JSP复制到指定目录 -->
- <property name="copyJarJspFile">
- <value>false</value>
- </property>
- <!-- 指定数据库类型 -->
- <property name="dataBaseKind">
- <value>oracle</value>
- </property>
- <property name="sharedbUserName">
- <value>SHAREDB</value>
- </property>
- <property name="standardUserName">
- <value>STANDCODE</value>
- </property>
- <property name="tempPath">
- <value>d:/temp/</value>
- </property>
- <property name="webserviceurl">
- <value>http://localhost:7010/</value>
- </property>
- <property name="resourceServerUrl">
- <value>http://app.supwisdom.com:9080/resources</value>
- </property>
+ <value>${resourcePath}</value>
+ </property>
+ <!-- 上线后此项应设置为false -->
+ <property name="debugMode">
+ <value>${debugMode}</value>
+ </property>
+ <!-- 是否把JAR中的JSP复制到指定目录 -->
+ <property name="copyJarJspFile">
+ <value>${copyJarJspFile}</value>
+ </property>
+ <property name="sitFooterInfo">
+ <value>${sitFooterInfo}</value>
+ </property>
+ <property name="tempPath">
+ <value>${tempPath}</value>
+ </property>
+
+ <property name="resourceServerUrl">
+ <value>${resourceServerUrl}</value>
+ </property>
+ </bean>
+
+ <!-- 使用 redis 时，请取消注释该配置 -->
+ <!--
+ <bean id="jedisConnectionFactory" class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory" >
+ <property name="hostName" value="${redis.hostName}"/>
+ <property name="port" value="${redis.port}"/>
+ <property name="password" value="${redis.password}"/>
</bean>
+ -->
<beans profile="production">
<jee:jndi-lookup id="dataSource" jndi-name="java:comp/env/jdbc/biz" resource-ref="true" />